tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-26 23:35:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make it compile without warnings with -Wconversion

Browse Source
This commit is contained in:
ZyX 2014-08-04 02:21:44 +04:00
parent a5037a817b
commit da45adb9e6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/powerline.c
View File

@ -3,6 +3,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h>
#include <sys/un.h> #include <sys/un.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -26,9 +27,9 @@
extern char **environ; extern char **environ;
void do_write(int sd, const char *raw, int len) { void do_write(int sd, const char *raw, size_t len) {
int written = 0; size_t written = 0;
int n = -1; ptrdiff_t n = -1;
while (written < len) { while (written < len) {
TEMP_FAILURE_RETRY(n, write(sd, raw + written, len - written)); TEMP_FAILURE_RETRY(n, write(sd, raw + written, len - written));
@ -36,7 +37,7 @@ void do_write(int sd, const char *raw, int len) {
close(sd); close(sd);
HANDLE_ERROR("write() failed"); HANDLE_ERROR("write() failed");
} }
written += n; written += (size_t) n;
} }
} }
@ -55,7 +56,7 @@ void do_write(int sd, const char *raw, int len) {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
int sd = -1; int sd = -1;
int i; ptrdiff_t i;
struct sockaddr_un server; struct sockaddr_un server;
char address[ADDRESS_SIZE]; char address[ADDRESS_SIZE];
const char eof[2] = "\0\0"; const char eof[2] = "\0\0";
@ -78,7 +79,7 @@ int main(int argc, char *argv[]) {
server.sun_family = AF_UNIX; server.sun_family = AF_UNIX;
strncpy(server.sun_path A, address, strlen(address)); strncpy(server.sun_path A, address, strlen(address));
if (connect(sd, (struct sockaddr *) &server, sizeof(server.sun_family) + strlen(address) A) < 0) { if (connect(sd, (struct sockaddr *) &server, (socklen_t) (sizeof(server.sun_family) + strlen(address) A)) < 0) {
close(sd); close(sd);
/* We failed to connect to the daemon, execute powerline instead */ /* We failed to connect to the daemon, execute powerline instead */
argc = (argc < NEW_ARGV_SIZE - 1) ? argc : NEW_ARGV_SIZE - 1; argc = (argc < NEW_ARGV_SIZE - 1) ? argc : NEW_ARGV_SIZE - 1;
@ -116,7 +117,7 @@ int main(int argc, char *argv[]) {
close(sd); close(sd);
HANDLE_ERROR("read() failed"); HANDLE_ERROR("read() failed");
} else if (i > 0) { } else if (i > 0) {
(void) write(STDOUT_FILENO, buf, i); (void) write(STDOUT_FILENO, buf, (size_t) i);
} }
} }