Merge pull request #528 from Tarsnap/clang-scan

Nitpicks from clang-scan

lib/network/tsnetwork_sleep.c

@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -41,7 +42,7 @@ network_sleep(struct timeval * timeo,
     network_callback * callback, void * cookie)
 {
 	struct sleeper s;
-	struct sleeper * sp = NULL;	/* Silence bogus gcc warning. */
+	struct sleeper * sp = NULL;	/* Silence bogus compiler warnings. */
 	size_t h;
 
 	/* Initialize array if required. */
@@ -83,6 +84,12 @@ network_sleep(struct timeval * timeo,
 		/* Append the record. */
 		if (sleepers_append(sleepers, &sp, 1))
 			goto err1;
+	} else {
+		/*-
+		 * If (h != sleepers_getsize()), then sp was set in the
+		 * earlier 'for' loop, but compilers don't realize it.
+		 */
+		assert(sp != NULL);
 	}
 
 	/* Register the timer event. */

libarchive/archive_read_support_format_tar.c

@@ -538,6 +538,7 @@ archive_read_format_tar_read_advance(struct archive_read *a, off_t offset)
 	if (tar->entry_padding >= offset) {
 		tar->entry_padding -= offset;
 		offset = 0;
+		(void)offset; /* not used beyond this point. */
 	} else {
 		archive_set_error(&a->archive, ARCHIVE_ERRNO_PROGRAMMER,
 		    "read_advance beyond end of entry");

tar/multitape/multitape_metadata.c

@@ -269,6 +269,8 @@ multitape_metadata_dec(struct tapemetadata * mdat, uint8_t * buf,
 	buflen -= 256;
 	p += 256;
 
+	(void)p; /* not used beyond this point. */
+
 	/* We should be at the end of the metadata now. */
 	if (buflen != 0)
 		goto bad2;

tar/multitape/multitape_metaindex.c

@@ -106,6 +106,8 @@ multitape_metaindex_put(STORAGE_W * S, CHUNKS_W * C,
 		memcpy(p, mind->tindex, mind->tindexlen);
 	p += mind->tindexlen;
 
+	(void)p; /* not used beyond this point. */
+
 	/* Compute hash of tape name. */
 	if (crypto_hash_data(CRYPTO_KEY_HMAC_NAME,
 	    (uint8_t *)mdat->name, strlen(mdat->name), hbuf))
@@ -273,6 +275,8 @@ multitape_metaindex_get(STORAGE_R * S, CHUNKS_S * C,
 	if (buflen != 0)
 		goto corrupt3;
 
+	(void)buf; /* not used beyond this point. */
+
 	/* Free metaindex buffer. */
 	free(mbuf);
 

tests/valgrind/potential-memleaks.c

@@ -56,6 +56,8 @@ pl_freebsd_getpwuid(void)
 		exit(1);
 	}
 
+	(void)pwd; /* not used beyond this point. */
+
 	/* POSIX says that we *shall not* free `pwd`. */
 }