← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/row.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/row.c
70
70
    if (drizzle_row_read(result, ret_ptr) == 0 || *ret_ptr != DRIZZLE_RETURN_OK)
71
71
      return NULL;
72
72
 
73
 
    result->row= malloc((sizeof(drizzle_field_t) + sizeof(size_t)) *
74
 
                        result->column_count);
 
73
    result->row= (drizzle_row_t)malloc((sizeof(drizzle_field_t)
 
74
                                        + sizeof(size_t))
 
75
                                       * result->column_count);
75
76
    if (result->row == NULL)
76
77
    {
77
78
      drizzle_set_error(result->con->drizzle, "drizzle_row_buffer", "malloc");
196
197
    /* Got EOF packet, no more rows. */
197
198
    con->result->row_current= 0;
198
199
    con->result->warning_count= drizzle_get_byte2(con->buffer_ptr + 1);
199
 
    con->status= drizzle_get_byte2(con->buffer_ptr + 3);
 
200
    con->status= (drizzle_con_status_t)drizzle_get_byte2(con->buffer_ptr + 3);
200
201
    con->buffer_ptr+= 5;
201
202
    con->buffer_size-= 5;
202
203
  }