diff options
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2009-02-18 21:52:13 +0300 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2009-03-18 04:59:26 +0300 |
| commit | a9984a4e60291958a7cf0045758f47db3d214040 (patch) | |
| tree | 42608eb49e4be32002462b51e86065368b342c05 /src | |
| parent | fc3c3a2083e9f6f89e6bd53e9420e70d1e357c9b (diff) | |
Fix some (digital-mars) compiler warnings
In particular, conditional expressions which contain an
assignment statement, where the expression type is not
explicitly made to be boolean, elicits the following
message:
warning 2: possible unintended assignment
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/delta-apply.c | 2 | ||||
| -rw-r--r-- | src/fileops.c | 2 | ||||
| -rw-r--r-- | src/odb.c | 10 | ||||
| -rw-r--r-- | src/util.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/delta-apply.c b/src/delta-apply.c index 4852017de..7b592ecfb 100644 --- a/src/delta-apply.c +++ b/src/delta-apply.c @@ -47,7 +47,7 @@ int git__delta_apply( return GIT_ERROR; res_sz = hdr_sz(&delta, delta_end); - if (!(res_dp = git__malloc(res_sz + 1))) + if ((res_dp = git__malloc(res_sz + 1)) == NULL) return GIT_ERROR; res_dp[res_sz] = '\0'; out->data = res_dp; diff --git a/src/fileops.c b/src/fileops.c index 8cc293419..1f8435d47 100644 --- a/src/fileops.c +++ b/src/fileops.c @@ -232,7 +232,7 @@ int gitfo_dirent( if (!dir) return git_os_error(); - while ((de = readdir(dir))) { + while ((de = readdir(dir)) != NULL) { size_t de_len; int result; @@ -558,7 +558,7 @@ static int pack_openidx_v1(git_pack *p) size_t expsz; int j; - if (!(im_fanout = git__malloc(sizeof(*im_fanout) * 256))) + if ((im_fanout = git__malloc(sizeof(*im_fanout) * 256)) == NULL) return GIT_ERROR; im_fanout[0] = decode32(&src_fanout[0]); @@ -615,7 +615,7 @@ static int pack_openidx_v2(git_pack *p) uint32_t *im_fanout; int j; - if (!(im_fanout = git__malloc(sizeof(*im_fanout) * 256))) + if ((im_fanout = git__malloc(sizeof(*im_fanout) * 256)) == NULL) return GIT_ERROR; im_fanout[0] = decode32(&src_fanout[0]); @@ -751,11 +751,11 @@ static int scan_one_pack(void *state, char *name) if (gitfo_exists(name)) return 0; - if (!(r = git__malloc(sizeof(*r)))) + if ((r = git__malloc(sizeof(*r))) == NULL) return GIT_ERROR; *d = '\0'; /* "pack-abc.pack" -_> "pack-abc" */ - if (!(r->pack = alloc_pack(s + 1))) { + if ((r->pack = alloc_pack(s + 1)) == NULL) { free(r); return GIT_ERROR; } @@ -811,7 +811,7 @@ static git_packlist *packlist_get(git_odb *db) git_packlist *pl; gitlck_lock(&db->lock); - if ((pl = db->packlist)) + if ((pl = db->packlist) != NULL) pl->refcnt++; else pl = scan_packs(db); diff --git a/src/util.c b/src/util.c index 3184a3abd..bc95d2dc8 100644 --- a/src/util.c +++ b/src/util.c @@ -67,7 +67,7 @@ int git__dirname(char *dir, size_t n, char *path) assert(dir && n > 1); - if (!path || !*path || !(s = strrchr(path, '/'))) { + if (!path || !*path || (s = strrchr(path, '/')) == NULL) { strcpy(dir, "."); return 1; } @@ -99,7 +99,7 @@ int git__basename(char *base, size_t n, char *path) } len = strlen(path); - if (!(s = strrchr(path, '/'))) { + if ((s = strrchr(path, '/')) == NULL) { if (len >= n) return GIT_ERROR; strcpy(base, path); |