=== modified file 'plugins.d/askpass-fifo.c' --- plugins.d/askpass-fifo.c 2009-01-04 21:54:55 +0000 +++ plugins.d/askpass-fifo.c 2009-01-10 02:21:13 +0000 @@ -43,14 +43,14 @@ /* Create FIFO */ const char passfifo[] = "/lib/cryptsetup/passfifo"; - ret = TEMP_FAILURE_RETRY(mkfifo(passfifo, S_IRUSR | S_IWUSR)); + ret = (int)TEMP_FAILURE_RETRY(mkfifo(passfifo, S_IRUSR | S_IWUSR)); if(ret == -1 and errno != EEXIST){ perror("mkfifo"); return EXIT_FAILURE; } /* Open FIFO */ - int fifo_fd = TEMP_FAILURE_RETRY(open(passfifo, O_RDONLY)); + int fifo_fd = (int)TEMP_FAILURE_RETRY(open(passfifo, O_RDONLY)); if(fifo_fd == -1){ perror("open"); return EXIT_FAILURE; === modified file 'plugins.d/mandos-client.c' --- plugins.d/mandos-client.c 2009-01-04 21:54:55 +0000 +++ plugins.d/mandos-client.c 2009-01-10 02:21:13 +0000 @@ -156,7 +156,7 @@ int fd; gpgme_data_t pgp_data; - fd = TEMP_FAILURE_RETRY(open(filename, O_RDONLY)); + fd = (int)TEMP_FAILURE_RETRY(open(filename, O_RDONLY)); if(fd == -1){ perror("open"); return false; @@ -176,7 +176,7 @@ return false; } - ret = TEMP_FAILURE_RETRY(close(fd)); + ret = (int)TEMP_FAILURE_RETRY(close(fd)); if(ret == -1){ perror("close"); } @@ -501,6 +501,7 @@ AvahiIfIndex if_index, mandos_context *mc){ int ret, tcp_sd; + ssize_t sret; union { struct sockaddr in; struct sockaddr_in6 in6; } to; char *buffer = NULL; char *decrypted_buffer; @@ -577,7 +578,7 @@ written = 0; while (true){ size_t out_size = strlen(out); - ret = TEMP_FAILURE_RETRY(write(tcp_sd, out + written, + ret = (int)TEMP_FAILURE_RETRY(write(tcp_sd, out + written, out_size - written)); if (ret == -1){ perror("write"); @@ -632,13 +633,13 @@ goto mandos_end; } - ret = gnutls_record_recv(session, buffer+buffer_length, - BUFFER_SIZE); - if (ret == 0){ + sret = gnutls_record_recv(session, buffer+buffer_length, + BUFFER_SIZE); + if (sret == 0){ break; } - if (ret < 0){ - switch(ret){ + if (sret < 0){ + switch(sret){ case GNUTLS_E_INTERRUPTED: case GNUTLS_E_AGAIN: break; @@ -661,7 +662,7 @@ goto mandos_end; } } else { - buffer_length += (size_t) ret; + buffer_length += (size_t) sret; } } @@ -703,7 +704,7 @@ mandos_end: free(buffer); - ret = TEMP_FAILURE_RETRY(close(tcp_sd)); + ret = (int)TEMP_FAILURE_RETRY(close(tcp_sd)); if(ret == -1){ perror("close"); } @@ -940,7 +941,7 @@ goto end; } } - ret = TEMP_FAILURE_RETRY(close(sd)); + ret = (int)TEMP_FAILURE_RETRY(close(sd)); if(ret == -1){ perror("close"); } === modified file 'plugins.d/usplash.c' --- plugins.d/usplash.c 2009-01-04 21:54:55 +0000 +++ plugins.d/usplash.c 2009-01-10 02:21:13 +0000 @@ -92,10 +92,11 @@ } size_t written = 0; + ssize_t sret = 0; while(not interrupted_by_signal and written < cmd_line_len){ - ret = write(fifo_fd, cmd_line + written, - cmd_line_len - written); - if(ret == -1){ + sret = write(fifo_fd, cmd_line + written, + cmd_line_len - written); + if(sret == -1){ if(errno != EINTR or interrupted_by_signal){ int e = errno; close(fifo_fd); @@ -106,7 +107,7 @@ continue; } } - written += (size_t)ret; + written += (size_t)sret; } free(cmd_line_alloc); do{