← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/protocol.cc

  • Committer: Monty Taylor
  • Date: 2008-09-23 14:19:48 UTC
  • mto: This revision was merged to the branch mainline in revision 419.
  • Revision ID: monty@inaugust.com-20080923141948-ktph2kg13addaxq1
Actually removed VOID() this time.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/protocol.cc
183
183
 
184
184
  if (message && message[0])
185
185
    pos= net_store_data(pos, (uchar*) message, strlen(message));
186
 
  VOID(my_net_write(net, buff, (size_t) (pos-buff)));
187
 
  VOID(net_flush(net));
 
186
  my_net_write(net, buff, (size_t) (pos-buff));
 
187
  net_flush(net);
188
188
 
189
189
  thd->main_da.can_overwrite_status= false;
190
190
}
217
217
  {
218
218
    thd->main_da.can_overwrite_status= true;
219
219
    write_eof_packet(thd, net, server_status, total_warn_count);
220
 
    VOID(net_flush(net));
 
220
    net_flush(net);
221
221
    thd->main_da.can_overwrite_status= false;
222
222
  }
223
223
}
248
248
  if (thd->is_fatal_error)
249
249
    server_status&= ~SERVER_MORE_RESULTS_EXISTS;
250
250
  int2store(buff + 3, server_status);
251
 
  VOID(my_net_write(net, buff, 5));
 
251
  my_net_write(net, buff, 5);
252
252
}
253
253
 
254
254
void net_send_error_packet(THD *thd, uint sql_errno, const char *err)
276
276
                  (char*) buff);
277
277
  err= (char*) buff;
278
278
 
279
 
  VOID(net_write_command(net,(uchar) 255, (uchar*) "", 0, (uchar*) err,
280
 
                         length));
 
279
  net_write_command(net,(uchar) 255, (uchar*) "", 0, (uchar*) err, length);
281
280
  return;
282
281
}
283
282