← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/structs.h

  • Committer: Brian Aker
  • Date: 2011-11-23 21:52:22 UTC
  • mfrom: (2461.1.4 drizzle-build)
  • mto: This revision was merged to the branch mainline in revision 2465.
  • Revision ID: brian@tangent.org-20111123215222-r9qdzhzch2b8jj2b
Break out options, first pass.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-2.0/structs.h
161
161
  int capabilities;
162
162
  drizzle_charset_t charset;
163
163
  drizzle_command_t command;
 
164
  struct option_t {
 
165
    bool is_allocated;
 
166
 
 
167
    option_t() :
 
168
      is_allocated(false)
 
169
    { }
 
170
  } _options;
164
171
  int options;
165
172
  drizzle_con_socket_t socket_type;
166
173
  drizzle_con_status_t status;
245
252
  drizzle_st *drizzle;
246
253
  drizzle_query_st *next;
247
254
  drizzle_query_st *prev;
248
 
  int options;
 
255
  struct option_t {
 
256
    bool is_allocated;
 
257
 
 
258
    option_t() :
 
259
      is_allocated(false)
 
260
    { }
 
261
  } options;
249
262
  drizzle_query_state_t state;
250
263
  drizzle_con_st *con;
251
264
  drizzle_result_st *result;
258
271
    drizzle(NULL),
259
272
    next(NULL),
260
273
    prev(NULL),
261
 
    options(0),
262
274
    con(NULL),
263
275
    result(NULL),
264
276
    string(NULL),
277
289
  drizzle_con_st *con;
278
290
  drizzle_result_st *next;
279
291
  drizzle_result_st *prev;
 
292
  struct option_t {
 
293
    bool is_allocated;
 
294
 
 
295
    option_t() :
 
296
      is_allocated(false)
 
297
    { }
 
298
  } _options;
280
299
  int options;
281
300
 
282
301
  char info[DRIZZLE_MAX_INFO_SIZE];
344
363
  drizzle_result_st *result;
345
364
  drizzle_column_st *next;
346
365
  drizzle_column_st *prev;
347
 
  int options;
 
366
  struct options_t {
 
367
    bool is_allocated;
 
368
 
 
369
    options_t() :
 
370
      is_allocated(false)
 
371
    { }
 
372
  } options;
348
373
  char catalog[DRIZZLE_MAX_CATALOG_SIZE];
349
374
  char schema[DRIZZLE_MAX_DB_SIZE];
350
375
  char table[DRIZZLE_MAX_TABLE_SIZE];
364
389
    result(NULL),
365
390
    next(NULL),
366
391
    prev(NULL),
367
 
    options(0),
368
392
    size(0),
369
393
    max_size(0),
370
394
    flags(DRIZZLE_COLUMN_FLAGS_NONE),