← Back to branch summary

~fallenpegasus/drizzle/returning

« back to all changes in this revision

Viewing changes to libdrizzle/net_serv.c

  • Committer: Brian Aker
  • Date: 2009-01-28 19:37:25 UTC
  • mfrom: (779.3.11 devel)
  • Revision ID: brian@tangent.org-20090128193725-pz7g7dnp2dx0863e
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/net_serv.c
523
523
  if (net->write_timeout)
524
524
  {
525
525
    struct timespec waittime;
526
 
    socklen_t length;
 
526
    socklen_t time_len;
527
527
 
528
528
    waittime.tv_sec= net->write_timeout;
529
529
    waittime.tv_nsec= 0;
530
530
 
531
531
    memset(&backtime, 0, sizeof(struct timespec));
532
 
    length= sizeof(struct timespec);
 
532
    time_len= sizeof(struct timespec);
533
533
    error= getsockopt(net->vio->sd, SOL_SOCKET, SO_RCVTIMEO,
534
 
                      &backtime, &length);
 
534
                      &backtime, &time_len);
535
535
    if (error != 0)
536
536
    {
537
537
      perror("getsockopt");
642
642
  if (net->read_timeout)
643
643
  {
644
644
    struct timespec waittime;
645
 
    socklen_t length;
 
645
    socklen_t time_len;
646
646
 
647
647
    waittime.tv_sec= net->read_timeout;
648
648
    waittime.tv_nsec= 0;
649
649
 
650
650
    memset(&backtime, 0, sizeof(struct timespec));
651
 
    length= sizeof(struct timespec);
 
651
    time_len= sizeof(struct timespec);
652
652
    error= getsockopt(net->vio->sd, SOL_SOCKET, SO_RCVTIMEO,
653
 
                      &backtime, &length);
 
653
                      &backtime, &time_len);
654
654
    if (error != 0)
655
655
    {
656
656
      perror("getsockopt");