WT-2471: review WiredTiger "int" printf formats

4 files changed, 30 insertions, 21 deletions

diff --git a/examples/c/ex_async.c b/examples/c/ex_async.c
index 584c3e54b87..ecdbd2f4fea 100644
--- a/examples/c/ex_async.c
+++ b/examples/c/ex_async.c
@@ -218,7 +218,7 @@ main(void)
 	 */
 	ret = conn->close(conn, NULL);
 
-	printf("Searched for %d keys\n", ex_asynckeys.num_keys);
+	printf("Searched for %" PRIu32 " keys\n", ex_asynckeys.num_keys);
 
 	return (ret);
 }
diff --git a/examples/c/ex_config_parse.c b/examples/c/ex_config_parse.c
index 124eff21130..caa7ffa8fe0 100644
--- a/examples/c/ex_config_parse.c
+++ b/examples/c/ex_config_parse.c
@@ -99,7 +99,7 @@ main(void)
 	while ((ret = parser->next(parser, &k, &v)) == 0) {
 		printf("%.*s:", (int)k.len, k.str);
 		if (v.type == WT_CONFIG_ITEM_NUM)
-			printf("%d\n", (int)v.val);
+			printf("%" PRId64 "\n", v.val);
 		else
 			printf("%.*s\n", (int)v.len, v.str);
 	}
@@ -126,7 +126,7 @@ main(void)
 		    "log.file_max configuration: %s", wiredtiger_strerror(ret));
 		return (ret);
 	}
-	printf("log file max: %d\n", (int)v.val);
+	printf("log file max: %" PRId64 "\n", v.val);
 	/*! [nested get] */
 	ret = parser->close(parser);
 
diff --git a/examples/c/ex_extractor.c b/examples/c/ex_extractor.c
index fff9c79f8e0..8623f4759fc 100644
--- a/examples/c/ex_extractor.c
+++ b/examples/c/ex_extractor.c
@@ -99,11 +99,13 @@ my_extract(WT_EXTRACTOR *extractor, WT_SESSION *session,
 		 * key(s).  WiredTiger will perform the required operation
 		 * (such as a remove()).
 		 */
-		fprintf(stderr, "EXTRACTOR: index op for year %d: %s %s\n",
+		fprintf(stderr,
+		    "EXTRACTOR: index op for year %" PRIu16 ": %s %s\n",
 		    year, first_name, last_name);
 		result_cursor->set_key(result_cursor, year);
 		if ((ret = result_cursor->insert(result_cursor)) != 0) {
-			fprintf(stderr, "EXTRACTOR: op year %d: error %d\n",
+			fprintf(stderr,
+			    "EXTRACTOR: op year %" PRIu16 ": error %d\n",
 			    year, ret);
 			return (ret);
 		}
@@ -157,7 +159,7 @@ read_index(WT_SESSION *session)
 	 */
 	for (i = 0; i < 10 && RET_OK(ret); i++) {
 		year = (uint16_t)((rand() % YEAR_SPAN) + YEAR_BASE);
-		printf("Year %d:\n", year);
+		printf("Year %" PRIu16 ":\n", year);
 		cursor->set_key(cursor, year);
 		if ((ret = cursor->search(cursor)) != 0)
 			break;
@@ -181,7 +183,7 @@ read_index(WT_SESSION *session)
 		}
 	}
 	if (!RET_OK(ret))
-		fprintf(stderr, "Error %d for year %d\n", ret, year);
+		fprintf(stderr, "Error %d for year %" PRIu16 "\n", ret, year);
 
 	ret = cursor->close(cursor);
 	return (ret);
@@ -245,7 +247,8 @@ setup_table(WT_SESSION *session)
 		cursor->set_key(cursor, p.id);
 		cursor->set_value(cursor,
 		    p.last_name, p.first_name, p.term_start, p.term_end);
-		fprintf(stderr, "SETUP: table insert %d-%d: %s %s\n",
+		fprintf(stderr,
+		    "SETUP: table insert %" PRIu16 "-%" PRIu16 ": %s %s\n",
 		    p.term_start, p.term_end,
 		    p.first_name, p.last_name);
 		ret = cursor->insert(cursor);
diff --git a/examples/c/ex_schema.c b/examples/c/ex_schema.c
index f3d3a1b9cb4..70fc7eb2e62 100644
--- a/examples/c/ex_schema.c
+++ b/examples/c/ex_schema.c
@@ -165,7 +165,8 @@ main(void)
 		ret = cursor->get_key(cursor, &recno);
 		ret = cursor->get_value(cursor, &country, &year, &population);
 		printf("ID %" PRIu64, recno);
-		printf(": country %s, year %u, population %" PRIu64 "\n",
+		printf(
+		    ": country %s, year %" PRIu16 ", population %" PRIu64 "\n",
 		    country, year, population);
 	}
 	ret = cursor->close(cursor);
@@ -186,7 +187,8 @@ main(void)
 		ret = wiredtiger_struct_unpack(session,
 		    value.data, value.size,
 		    "5sHQ", &country, &year, &population);
-		printf(": country %s, year %u, population %" PRIu64 "\n",
+		printf(
+		    ": country %s, year %" PRIu16 ", population %" PRIu64 "\n",
 		    country, year, population);
 	}
 	/*! [List the records in the table using raw mode.] */
@@ -202,7 +204,9 @@ main(void)
 	cursor->set_key(cursor, 2);
 	if ((ret = cursor->search(cursor)) == 0) {
 		ret = cursor->get_value(cursor, &country, &year, &population);
-		printf("ID 2: country %s, year %u, population %" PRIu64 "\n",
+		printf(
+		    "ID 2: "
+		    "country %s, year %" PRIu16 ", population %" PRIu64 "\n",
 		    country, year, population);
 	}
 	/*! [Read population from the primary column group] */
@@ -230,8 +234,8 @@ main(void)
 	cursor->set_key(cursor, "AU\0\0\0");
 	ret = cursor->search(cursor);
 	ret = cursor->get_value(cursor, &country, &year, &population);
-	printf("AU: country %s, year %u, population %" PRIu64 "\n",
-	    country, (unsigned int)year, population);
+	printf("AU: country %s, year %" PRIu16 ", population %" PRIu64 "\n",
+	    country, year, population);
 	/*! [Search in a simple index] */
 	ret = cursor->close(cursor);
 
@@ -242,8 +246,9 @@ main(void)
 	cursor->set_key(cursor, "USA\0\0", (uint16_t)1900);
 	ret = cursor->search(cursor);
 	ret = cursor->get_value(cursor, &country, &year, &population);
-	printf("US 1900: country %s, year %u, population %" PRIu64 "\n",
-	    country, (unsigned int)year, population);
+	printf(
+	    "US 1900: country %s, year %" PRIu16 ", population %" PRIu64 "\n",
+	    country, year, population);
 	/*! [Search in a composite index] */
 	ret = cursor->close(cursor);
 
@@ -256,7 +261,7 @@ main(void)
 	    "table:poptable(country,year)", NULL, NULL, &cursor);
 	while ((ret = cursor->next(cursor)) == 0) {
 		ret = cursor->get_value(cursor, &country, &year);
-		printf("country %s, year %u\n", country, year);
+		printf("country %s, year %" PRIu16 "\n", country, year);
 	}
 	/*! [Return a subset of values from the table] */
 	ret = cursor->close(cursor);
@@ -274,7 +279,7 @@ main(void)
 		ret = cursor->get_value(cursor, &value);
 		ret = wiredtiger_struct_unpack(
 		    session, value.data, value.size, "5sH", &country, &year);
-		printf("country %s, year %u\n", country, year);
+		printf("country %s, year %" PRIu16 "\n", country, year);
 	}
 	/*! [Return a subset of values from the table using raw mode] */
 	ret = cursor->close(cursor);
@@ -289,7 +294,7 @@ main(void)
 	while ((ret = cursor->next(cursor)) == 0) {
 		ret = cursor->get_key(cursor, &country, &year);
 		ret = cursor->get_value(cursor, &recno);
-		printf("row ID %" PRIu64 ": country %s, year %u\n",
+		printf("row ID %" PRIu64 ": country %s, year %" PRIu16 "\n",
 		    recno, country, year);
 	}
 	/*! [Return the table's record number key using an index] */
@@ -306,7 +311,7 @@ main(void)
 	while ((ret = cursor->next(cursor)) == 0) {
 		ret = cursor->get_key(cursor, &country, &year);
 		ret = cursor->get_value(cursor, &population);
-		printf("population %" PRIu64 ": country %s, year %u\n",
+		printf("population %" PRIu64 ": country %s, year %" PRIu16 "\n",
 		    population, country, year);
 	}
 	/*! [Return a subset of the value columns from an index] */
@@ -321,7 +326,7 @@ main(void)
 	    "index:poptable:country_plus_year()", NULL, NULL, &cursor);
 	while ((ret = cursor->next(cursor)) == 0) {
 		ret = cursor->get_key(cursor, &country, &year);
-		printf("country %s, year %u\n", country, year);
+		printf("country %s, year %" PRIu16 "\n", country, year);
 	}
 	/*! [Access only the index] */
 	ret = cursor->close(cursor);
@@ -351,7 +356,8 @@ main(void)
 		ret = join_cursor->get_value(join_cursor, &country, &year,
 		    &population);
 		printf("ID %" PRIu64, recno);
-		printf(": country %s, year %u, population %" PRIu64 "\n",
+		printf(
+		    ": country %s, year %" PRIu16 ", population %" PRIu64 "\n",
 		    country, year, population);
 	}
 	/*! [Join cursors] */