← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/net_serv.c

  • Committer: Brian Aker
  • Date: 2008-07-15 06:45:16 UTC
  • Revision ID: brian@tangent.org-20080715064516-fnbq7kowh7w57bxj
Merge Monty's code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/net_serv.c
226
226
    {
227
227
      /* Read unblocking to clear net */
228
228
      my_bool old_mode;
229
 
      if (!vio_blocking(net->vio, FALSE, &old_mode))
 
229
      if (!vio_blocking(net->vio, false, &old_mode))
230
230
      {
231
231
        while ((long) (count= vio_read(net->vio, net->buff,
232
232
                                       (size_t) net->max_packet)) > 0)
233
233
          DBUG_PRINT("info",("skipped %ld bytes from file: %s",
234
234
                             (long) count, vio_description(net->vio)));
235
 
        vio_blocking(net->vio, TRUE, &old_mode);
 
235
        vio_blocking(net->vio, true, &old_mode);
236
236
      }
237
237
    }
238
238
#endif /* NET_DATA_IS_READY_CAN_RETURN_MINUS_ONE */
518
518
        if (!thr_alarm(&alarmed, net->write_timeout, &alarm_buff))
519
519
        {                                       /* Always true for client */
520
520
          my_bool old_mode;
521
 
          while (vio_blocking(net->vio, TRUE, &old_mode) < 0)
 
521
          while (vio_blocking(net->vio, true, &old_mode) < 0)
522
522
          {
523
523
            if (vio_should_retry(net->vio) && retry_count++ < net->retry_count)
524
524
              continue;