From ea5fc2d69353e5b675ebc1375160f5bed1ab52e9 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 9 Jun 2016 18:55:12 +0200 Subject: Fix errors --- bencode.c | 2 +- btcheck.c | 1 + meta.c | 4 ++-- peer.c | 4 ++-- tools.c | 4 ++-- tools.h | 2 +- tracker.c | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/bencode.c b/bencode.c index 6348994..e60d278 100644 --- a/bencode.c +++ b/bencode.c @@ -230,7 +230,7 @@ getstr(char **c) } memcpy(np->str, *c, len); - np->str[len] = NULL; + np->str[len] = '\0'; *c += len; return np; diff --git a/btcheck.c b/btcheck.c index 89cf62b..1aff411 100644 --- a/btcheck.c +++ b/btcheck.c @@ -16,6 +16,7 @@ */ #include +#include #include #include diff --git a/meta.c b/meta.c index ac4641c..96bb67c 100644 --- a/meta.c +++ b/meta.c @@ -97,7 +97,7 @@ btfreemeta(struct btmeta *mp) freeannounce(mp->announce); free(mp->name); free(mp->fname); - for (fp = SIMPLEQ_FIRST(&mp->flist); fp != SIMPLEQ_END(&mp->flist); fp = nxt) { + for (fp = SIMPLEQ_FIRST(&mp->flist); fp != NULL; fp = nxt) { nxt = SIMPLEQ_NEXT(fp, link); free(fp->path); free(fp); @@ -234,7 +234,7 @@ getannounce(char *src) if ((ap = calloc(1, sizeof(struct btannounce))) == NULL) return NULL; - if ((host = strcasestr(buf, HTTP_URL)) == NULL) { + if ((host = strstr(buf, HTTP_URL)) == NULL) { free(buf); return NULL; } else diff --git a/peer.c b/peer.c index 7f8ff96..46be671 100644 --- a/peer.c +++ b/peer.c @@ -142,7 +142,7 @@ btclearoldpeers(struct btplist *plist) struct btpeer *p, *nxt; int n = 0; - for (p = LIST_FIRST(plist); p != LIST_END(plist); p = nxt) { + for (p = LIST_FIRST(plist); p != NULL; p = nxt) { nxt = LIST_NEXT(p, link); if (--p->ttl <= 0 && p->state == FAILED) { LIST_REMOVE(p, link); @@ -159,7 +159,7 @@ btdelplist(struct btplist *plist) { struct btpeer *p, *nxt; - for (p = LIST_FIRST(plist); p != LIST_END(plist); p = nxt) { + for (p = LIST_FIRST(plist); p != NULL; p = nxt) { nxt = LIST_NEXT(p, link); free(p); } diff --git a/tools.c b/tools.c index 2c83092..e2e88d6 100644 --- a/tools.c +++ b/tools.c @@ -82,7 +82,7 @@ bthexdump(char *dst, u_char *src, int len) if (len <= 2 * SHA1LEN) return -1; - for (i = SHA1LEN, done = 0, *dst = NULL; i > 0; i--) { + for (i = SHA1LEN, done = 0, *dst = '\0'; i > 0; i--) { if (len > 3 * SHA1LEN) { if (isascii(*src) && (isalnum(*src) || *src == '-' || *src == '.' || @@ -183,7 +183,7 @@ btpeerid(u_char *str) str[i] = hex[arc4random() % sizeof(hex)]; } -__dead void +void usage(const char *usagearg) { extern char *__progname; diff --git a/tools.h b/tools.h index 93eb91f..d7be8e7 100644 --- a/tools.h +++ b/tools.h @@ -31,7 +31,7 @@ void *btmmapfile(char *, off_t *); void btunmapfile(void *, off_t); #endif /* MMAP */ void btpeerid(u_char *); -__dead void usage(const char *); +void usage(const char *); int setrcvtimeo(int, int); void twiddle(void); char *metric(double); diff --git a/tracker.c b/tracker.c index 41de365..3417791 100644 --- a/tracker.c +++ b/tracker.c @@ -199,7 +199,7 @@ buildrequest(struct bttracker *tp) if (tp->key != NULL) len += snprintf(buf + len, buflen - len, "key=%s", tp->key); - if (*tp->trackerid != NULL) { + if (*tp->trackerid != '\0') { bthexdump(hash, tp->trackerid, sizeof(hash)); len += snprintf(buf + len, buflen - len, "trackerid=%s", hash); } -- cgit v1.2.3