/mandos/release

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

« back to all changes in this revision

Viewing changes to plugins.d/usplash.c

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/usplash.c
92
92
  }
93
93
  
94
94
  size_t written = 0;
 
95
  ssize_t sret = 0;
95
96
  while(not interrupted_by_signal and written < cmd_line_len){
96
 
    ret = write(fifo_fd, cmd_line + written,
97
 
                cmd_line_len - written);
98
 
    if(ret == -1){
 
97
    sret = write(fifo_fd, cmd_line + written,
 
98
                 cmd_line_len - written);
 
99
    if(sret == -1){
99
100
      if(errno != EINTR or interrupted_by_signal){
100
101
        int e = errno;
101
102
        close(fifo_fd);
106
107
        continue;
107
108
      }
108
109
    }
109
 
    written += (size_t)ret;
 
110
    written += (size_t)sret;
110
111
  }
111
112
  free(cmd_line_alloc);
112
113
  do{