diff options
| author | Dominic Radermacher <dominic.radermacher@gmail.com> | 2016-12-24 11:23:07 +0100 |
|---|---|---|
| committer | Dominic Radermacher <dominic.radermacher@gmail.com> | 2016-12-24 11:23:07 +0100 |
| commit | 5646127c5218e7c4e77c68910708a810d67484d0 (patch) | |
| tree | 31be8eddf348c0586091bd11dd6d2fedd168efec | |
| parent | 1545a3bb49c6ecf462f798a71c3e371427c2ef8c (diff) | |
bugfix in Makefile, avoid some compiler warnings
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | include/socket.h | 4 | ||||
| -rw-r--r-- | src/mpd-i2c-ctrl.c | 10 | ||||
| -rw-r--r-- | src/socket.c | 11 |
4 files changed, 13 insertions, 14 deletions
@@ -27,7 +27,7 @@ install: $(PROGS) @printf "\t==> Installing progs\n" @install -m 0755 -d $(DESTDIR)/usr/bin @install -m 0755 -t $(DESTDIR)/usr/bin $(PROGS) - @ln -s $(DESTDIR)/usr/bin/mpd-i2c-ctrl $(DESTDIR)/usr/bin/mpd-send-cmd + @ln -s mpd-i2c-ctrl $(DESTDIR)/usr/bin/mpd-send-cmd # Generic instructions. Dont change. src/%.o: src/%.c diff --git a/include/socket.h b/include/socket.h index 6f9dcab..79a8f86 100644 --- a/include/socket.h +++ b/include/socket.h @@ -1,3 +1,3 @@ int sock_connect(const char *host, const char *port); -int sock_write(int sd, const char *buf, size_t len); -int sock_readln(int sd, char *buf, size_t len); +ssize_t sock_write(int sd, const char *buf, size_t len); +ssize_t sock_readln(int sd, char *buf, size_t len); diff --git a/src/mpd-i2c-ctrl.c b/src/mpd-i2c-ctrl.c index cc7468a..139bcf4 100644 --- a/src/mpd-i2c-ctrl.c +++ b/src/mpd-i2c-ctrl.c @@ -49,7 +49,7 @@ int mcp23017_getintf(int fd); int mcp23017_waitzero(int fd); int mpd_send_cmd(int sd, const char *cmd); int mpd_playlist(int sd, const char *playlist); -int decode_key(int keycode); +int decode_key(uint16_t keycode); int handle_keypress(uint8_t key); int handle_inotify_event(int fd); @@ -172,9 +172,9 @@ int mpd_playlist(int sd, const char *playlist) return 0; } -int decode_key(int keycode) +int decode_key(uint16_t keycode) { - return (sizeof(int)*8)-__builtin_clz(keycode)-1; + return (sizeof(uint16_t)*8)-__builtin_clz(keycode)-1; } int handle_keypress(uint8_t key) @@ -249,7 +249,7 @@ static int parse_config(const char *file) xmlFree(key); continue; } - int val=strtol((char *)key, &err, 16); + long int val=strtol((char *)key, &err, 16); if ((!*err) && (val >= 0) && (val < 256)) { action = xmlGetProp(cur, (const xmlChar *)"action"); buttonlist_set(val, (char *)action); @@ -301,7 +301,7 @@ int main(int argc, char **argv) mcp23017_init(fd, MCP23017_ADDR); int key=mcp23017_getintf(fd); if (key > 0) { - int code=decode_key(key); + uint8_t code=decode_key(key); // printf("got key %02x => decoded = %04x\n", key, code); handle_keypress(code); mcp23017_waitzero(fd); /* wait until keys released, clr irq */ diff --git a/src/socket.c b/src/socket.c index 2ad5f41..82fee8c 100644 --- a/src/socket.c +++ b/src/socket.c @@ -48,16 +48,15 @@ int sock_connect(const char *host, const char *port) /* -------------------------------------------------------------------- Write to a socket -------------------------------------------------------------------- */ -int sock_write(int sd, const char *buf, size_t len) +ssize_t sock_write(int sd, const char *buf, size_t len) { - ssize_t n; - size_t wrlen = 0; + ssize_t n, wrlen = 0; while (len) { n = write(sd, buf, len); if (n <= 0) return -1; - len -= n; + len -= (size_t)n; wrlen += n; buf += n; } @@ -68,7 +67,7 @@ int sock_write(int sd, const char *buf, size_t len) Read a \n terminated line from a socket -------------------------------------------------------------------- */ -int sock_readln(int sd, char *buf, size_t len) +ssize_t sock_readln(int sd, char *buf, size_t len) { char *newline, *bp = buf; ssize_t n; @@ -86,7 +85,7 @@ int sock_readln(int sd, char *buf, size_t len) if ((n = recv(sd, bp, len, MSG_PEEK)) <= 0) { return -1; } - if ((newline = memchr(bp, '\n', n)) != NULL) { + if ((newline = memchr(bp, '\n', (size_t)n)) != NULL) { n = newline - bp + 1; } if ((n = read(sd, bp, n)) == -1) { |