← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/state.cc

  • Committer: Mark Atwood
  • Date: 2011-12-22 04:39:00 UTC
  • mfrom: (2472.1.2 drizzle-build)
  • Revision ID: me@mark.atwood.name-20111222043900-utca466m80z3gj61
merge lp:~brianaker/drizzle/null-safety-fix-libdrizzle

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/state.cc
44
44
 
45
45
drizzle_return_t drizzle_state_loop(drizzle_con_st *con)
46
46
{
 
47
  if (con == NULL)
 
48
  {
 
49
    return DRIZZLE_RETURN_INVALID_ARGUMENT;
 
50
  }
 
51
 
47
52
  while (drizzle_state_none(con) == false)
48
53
  {
49
54
    drizzle_return_t ret= con->state_stack[con->state_current - 1](con);
64
69
 
65
70
drizzle_return_t drizzle_state_packet_read(drizzle_con_st *con)
66
71
{
 
72
  if (con == NULL)
 
73
  {
 
74
    return DRIZZLE_RETURN_INVALID_ARGUMENT;
 
75
  }
 
76
 
67
77
  drizzle_log_debug(con->drizzle, "drizzle_state_packet_read");
68
78
 
69
79
  if (con->buffer_size < 4)