Fix a bitwise negation assignment issue spotted by Sun Studio

avar · gitster · commit 952fba9c6341 · 2011-12-21T10:19:40.000-08:00
Change direct and indirect assignments of the bitwise negation of 0 to
uint32_t variables to have a "U" suffix. I.e. ~0U instead of ~0. This
eliminates warnings under Sun Studio 12 Update 1:

    "vcs-svn/string_pool.c", line 11: warning: initializer will be sign-extended: -1 (E_INIT_SIGN_EXTEND)
    "vcs-svn/string_pool.c", line 81: warning: initializer will be sign-extended: -1 (E_INIT_SIGN_EXTEND)
    "vcs-svn/repo_tree.c", line 112: warning: initializer will be sign-extended: -1 (E_INIT_SIGN_EXTEND)
    "vcs-svn/repo_tree.c", line 112: warning: initializer will be sign-extended: -1 (E_INIT_SIGN_EXTEND)
    "test-treap.c", line 34: warning: initializer will be sign-extended: -1 (E_INIT_SIGN_EXTEND)

The semantics are still the same as demonstrated by this program:

    $ cat test.c &amp;&amp; make test &amp;&amp; ./test
    #include &lt;stdio.h&gt;
    #include &lt;stdint.h&gt;

    int main(void)
    {
        uint32_t foo = ~0;
        uint32_t bar = ~0U;

        printf("foo = &lt;%u&gt; bar = &lt;%u&gt;\n", foo, bar);

        return 0;
    }
    cc     test.c   -o test
    "test.c", line 5: warning: initializer will be sign-extended: -1
    foo = &lt;4294967295&gt; bar = &lt;4294967295&gt;

Signed-off-by: Ævar Arnfjörð Bjarmason &lt;avarab@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/test-treap.c b/test-treap.c
@@ -31,7 +31,7 @@ static void strtonode(struct int_node *item, const char *s)
 int main(int argc, char *argv[])
 {
 	struct strbuf sb = STRBUF_INIT;
-	struct trp_root root = { ~0 };
+	struct trp_root root = { ~0U };
 	uint32_t item;
 
 	if (argc != 1)
diff --git a/vcs-svn/repo_tree.c b/vcs-svn/repo_tree.c
@@ -109,7 +109,7 @@ static struct repo_dirent *repo_read_dirent(uint32_t revision,
 static void repo_write_dirent(const uint32_t *path, uint32_t mode,
 			      uint32_t content_offset, uint32_t del)
 {
-	uint32_t name, revision, dir_o = ~0, parent_dir_o = ~0;
+	uint32_t name, revision, dir_o = ~0U, parent_dir_o = ~0U;
 	struct repo_dir *dir;
 	struct repo_dirent *key;
 	struct repo_dirent *dent = NULL;
diff --git a/vcs-svn/string_pool.c b/vcs-svn/string_pool.c
@@ -8,7 +8,7 @@
 #include "obj_pool.h"
 #include "string_pool.h"
 
-static struct trp_root tree = { ~0 };
+static struct trp_root tree = { ~0U };
 
 struct node {
 	uint32_t offset;
@@ -78,7 +78,7 @@ void pool_print_seq(uint32_t len, uint32_t *seq, char delim, FILE *stream)
 uint32_t pool_tok_seq(uint32_t sz, uint32_t *seq, const char *delim, char *str)
 {
 	char *context = NULL;
-	uint32_t token = ~0;
+	uint32_t token = ~0U;
 	uint32_t length;
 
 	if (sz == 0)

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ static void strtonode(struct int_node item, const char s)`
`31`	`31`	`int main(int argc, char *argv[])`
`32`	`32`	`{`
`33`	`33`	`struct strbuf sb = STRBUF_INIT;`
`34`		`- struct trp_root root = { ~0 };`
	`34`	`+ struct trp_root root = { ~0U };`
`35`	`35`	`uint32_t item;`
`36`	`36`
`37`	`37`	`if (argc != 1)`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ static struct repo_dirent *repo_read_dirent(uint32_t revision,`
`109`	`109`	`static void repo_write_dirent(const uint32_t *path, uint32_t mode,`
`110`	`110`	`uint32_t content_offset, uint32_t del)`
`111`	`111`	`{`
`112`		`- uint32_t name, revision, dir_o = ~0, parent_dir_o = ~0;`
	`112`	`+ uint32_t name, revision, dir_o = ~0U, parent_dir_o = ~0U;`
`113`	`113`	`struct repo_dir *dir;`
`114`	`114`	`struct repo_dirent *key;`
`115`	`115`	`struct repo_dirent *dent = NULL;`