← Back to branch summary

~brianaker/gearmand/warning-usage

« back to all changes in this revision

Viewing changes to libgearman/connection.cc

  • Committer: Brian Aker
  • Date: 2013-02-20 20:06:42 UTC
  • mto: (621.49.2 1.0-build)
  • mto: This revision was merged to the branch mainline in revision 704.
  • Revision ID: brian@tangent.org-20130220200642-n55r0d3sauhfj8lt
Update for cleaning up server_options, and pushing core over to build elsewhere.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libgearman/connection.cc
139
139
  send_buffer_ptr(NULL),
140
140
  _recv_packet(NULL)
141
141
{
142
 
  options.ready= false;
143
 
  options.packet_in_use= false;
144
 
  options.server_options_sent= false;
145
 
 
146
142
  if (options_args)
147
143
  {
148
144
    while (*options_args != GEARMAN_CON_MAX)
365
361
 */
366
362
gearman_return_t gearman_connection_st::send_packet(const gearman_packet_st& packet_arg, const bool flush_buffer)
367
363
{
368
 
  if (!options.server_options_sent)
 
364
  if (options.server_options_sent == false)
369
365
  {
370
366
    for (gearman_server_options_st* head= universal.server_options_list;
371
367
         head;
372
368
         head= head->next)
373
369
    {
374
370
      gearman_packet_st message;
375
 
      const void *args[]= { head->option };
376
 
      size_t args_size[]= { head->option_length };
 
371
      const void *args[]= { head->_option };
 
372
      size_t args_size[]= { head->_option_length };
377
373
      gearman_return_t ret= gearman_packet_create_args(universal, message, GEARMAN_MAGIC_REQUEST,
378
374
                                                       GEARMAN_COMMAND_OPTION_REQ, args, args_size, 1);
379
375