/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/mandos-client.c

  • Committer: Teddy Hogeborn
  • Date: 2009-01-10 02:39:56 UTC
  • mfrom: (257.1.2 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090110023956-o7f5r8af28fmgahw
Fixed warnings on AMD64, thanks to Mooie <mooie@cow.se> for the patch.

* plugins.d/askpass-fifo.c (main): Cast value from TEMP_FAILURE_RETRY
                                   to int, the value the inner
                                   function returns.
* plugins.d/mandos-client.c (init_gpgme): - '' -
  (start_mandos_communication): New variable "ssize_t sret"; used to
                                store return value from
                                "gnutls_record_recv".  Also cast value
                                from TEMP_FAILURE_RETRY as above.
* plugins.d/usplash.c (usplash_write): New variable "ssize_t sret";
                                       used to store return value from
                                       "write".

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
9
9
 * "browse_callback", and parts of "main".
10
10
 * 
11
11
 * Everything else is
12
 
 * Copyright © 2008 Teddy Hogeborn & Björn Påhlsson
 
12
 * Copyright © 2008,2009 Teddy Hogeborn
 
13
 * Copyright © 2008,2009 Björn Påhlsson
13
14
 * 
14
15
 * This program is free software: you can redistribute it and/or
15
16
 * modify it under the terms of the GNU General Public License as
155
156
    int fd;
156
157
    gpgme_data_t pgp_data;
157
158
    
158
 
    fd = TEMP_FAILURE_RETRY(open(filename, O_RDONLY));
 
159
    fd = (int)TEMP_FAILURE_RETRY(open(filename, O_RDONLY));
159
160
    if(fd == -1){
160
161
      perror("open");
161
162
      return false;
175
176
      return false;
176
177
    }
177
178
    
178
 
    ret = TEMP_FAILURE_RETRY(close(fd));
 
179
    ret = (int)TEMP_FAILURE_RETRY(close(fd));
179
180
    if(ret == -1){
180
181
      perror("close");
181
182
    }
500
501
                                      AvahiIfIndex if_index,
501
502
                                      mandos_context *mc){
502
503
  int ret, tcp_sd;
 
504
  ssize_t sret;
503
505
  union { struct sockaddr in; struct sockaddr_in6 in6; } to;
504
506
  char *buffer = NULL;
505
507
  char *decrypted_buffer;
576
578
  written = 0;
577
579
  while (true){
578
580
    size_t out_size = strlen(out);
579
 
    ret = TEMP_FAILURE_RETRY(write(tcp_sd, out + written,
 
581
    ret = (int)TEMP_FAILURE_RETRY(write(tcp_sd, out + written,
580
582
                                   out_size - written));
581
583
    if (ret == -1){
582
584
      perror("write");
631
633
      goto mandos_end;
632
634
    }
633
635
    
634
 
    ret = gnutls_record_recv(session, buffer+buffer_length,
635
 
                             BUFFER_SIZE);
636
 
    if (ret == 0){
 
636
    sret = gnutls_record_recv(session, buffer+buffer_length,
 
637
                              BUFFER_SIZE);
 
638
    if (sret == 0){
637
639
      break;
638
640
    }
639
 
    if (ret < 0){
640
 
      switch(ret){
 
641
    if (sret < 0){
 
642
      switch(sret){
641
643
      case GNUTLS_E_INTERRUPTED:
642
644
      case GNUTLS_E_AGAIN:
643
645
        break;
660
662
        goto mandos_end;
661
663
      }
662
664
    } else {
663
 
      buffer_length += (size_t) ret;
 
665
      buffer_length += (size_t) sret;
664
666
    }
665
667
  }
666
668
  
702
704
  
703
705
 mandos_end:
704
706
  free(buffer);
705
 
  ret = TEMP_FAILURE_RETRY(close(tcp_sd));
 
707
  ret = (int)TEMP_FAILURE_RETRY(close(tcp_sd));
706
708
  if(ret == -1){
707
709
    perror("close");
708
710
  }
939
941
          goto end;
940
942
        }
941
943
      }
942
 
      ret = TEMP_FAILURE_RETRY(close(sd));
 
944
      ret = (int)TEMP_FAILURE_RETRY(close(sd));
943
945
      if(ret == -1){
944
946
        perror("close");
945
947
      }