← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/query.c

  • Committer: Monty Taylor
  • Date: 2010-12-10 14:36:32 UTC
  • mto: (2023.3.15 innodb-cxx)
  • mto: This revision was merged to the branch mainline in revision 2014.
  • Revision ID: mordred@inaugust.com-20101210143632-6ucvr5sb4dnxwjv2
Fixed c++-compat warnings in libdrizzle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/query.c
97
97
{
98
98
  if (query == NULL)
99
99
  {
100
 
    query= malloc(sizeof(drizzle_query_st));
 
100
    query= (drizzle_query_st *)malloc(sizeof(drizzle_query_st));
101
101
    if (query == NULL)
102
102
    {
103
103
      drizzle_set_error(drizzle, "drizzle_query_create", "malloc");
179
179
  query->size= size;
180
180
}
181
181
 
182
 
drizzle_query_options_t drizzle_query_options(drizzle_query_st *query)
 
182
int drizzle_query_options(drizzle_query_st *query)
183
183
{
184
184
  return query->options;
185
185
}
186
186
 
187
187
void drizzle_query_set_options(drizzle_query_st *query,
188
 
                               drizzle_query_options_t options)
 
188
                               int options)
189
189
{
190
190
  query->options= options;
191
191
}
192
192
 
193
193
void drizzle_query_add_options(drizzle_query_st *query,
194
 
                               drizzle_query_options_t options)
 
194
                               int options)
195
195
{
196
196
  query->options|= options;
197
197
}
198
198
 
199
199
void drizzle_query_remove_options(drizzle_query_st *query,
200
 
                                  drizzle_query_options_t options)
 
200
                                  int options)
201
201
{
202
202
  query->options&= ~options;
203
203
}
259
259
drizzle_query_st *drizzle_query_run(drizzle_st *drizzle,
260
260
                                    drizzle_return_t *ret_ptr)
261
261
{
262
 
  drizzle_options_t options;
 
262
  int options;
263
263
  drizzle_query_st *query;
264
264
  drizzle_con_st *con;
265
265