← Back to branch summary

~linuxjedi/libdrizzle/5.1-docs2

« back to all changes in this revision

Viewing changes to libdrizzle/result.cc

  • Committer: Continuous Integration
  • Date: 2013-01-27 05:12:36 UTC
  • mfrom: (99.1.3 libdrizzle-5.1)
  • Revision ID: ci@drizzle.org-20130127051236-nqlrftvdxxv4clm3
Merge lp:~brianaker/libdrizzle/push-pop-rework Build: jenkins-Libdrizzle-56

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/result.cc
265
265
    return NULL;
266
266
  }
267
267
 
268
 
  if (drizzle_state_none(con))
 
268
  if (con->has_state())
269
269
  {
270
270
    con->result= drizzle_result_create(con);
271
271
    if (con->result == NULL)
274
274
      return NULL;
275
275
    }
276
276
 
277
 
    drizzle_state_push(con, drizzle_state_result_read);
278
 
    drizzle_state_push(con, drizzle_state_packet_read);
 
277
    con->push_state(drizzle_state_result_read);
 
278
    con->push_state(drizzle_state_packet_read);
279
279
  }
280
280
 
281
281
  *ret_ptr= drizzle_state_loop(con);
392
392
  /* Assume the entire result packet will fit in the buffer. */
393
393
  if (con->buffer_size < con->packet_size)
394
394
  {
395
 
    drizzle_state_push(con, drizzle_state_read);
 
395
    con->push_state(drizzle_state_read);
396
396
    return DRIZZLE_RETURN_OK;
397
397
  }
398
398
 
474
474
    con->packet_size= 0;
475
475
  }
476
476
 
477
 
  drizzle_state_pop(con);
 
477
  con->pop_state();
478
478
  return ret;
479
479
}