Fix incorrect usage of maxlen argument in snprintf calls

4 files changed, 8 insertions, 6 deletions

diff --git a/tests/test_artifactory.c b/tests/test_artifactory.c
index 0d84289..fadc9f1 100644
--- a/tests/test_artifactory.c
+++ b/tests/test_artifactory.c
@@ -15,14 +15,14 @@ const char *gbuild_num = "1";
 static int jfrog_cli_rt_build_delete(struct JFRT_Auth *auth, char *build_name, char *build_num) {
     char cmd[STASIS_BUFSIZ];
     memset(cmd, 0, sizeof(cmd));
-    snprintf(cmd, sizeof(cmd) - 1, "--build \"%s/%s\"", build_name, build_num);
+    snprintf(cmd, sizeof(cmd), "--build \"%s/%s\"", build_name, build_num);
     return jfrog_cli(auth, "rt", "delete", cmd);
 }
 
 static int jfrog_cli_rt_delete(struct JFRT_Auth *auth, char *pattern) {
     char cmd[STASIS_BUFSIZ];
     memset(cmd, 0, sizeof(cmd));
-    snprintf(cmd, sizeof(cmd) - 1, "\"%s\"", pattern);
+    snprintf(cmd, sizeof(cmd), "\"%s\"", pattern);
     return jfrog_cli(auth, "rt", "delete", cmd);
 }
 
diff --git a/tests/test_junitxml.c b/tests/test_junitxml.c
index 362cb32..0bbbefb 100644
--- a/tests/test_junitxml.c
+++ b/tests/test_junitxml.c
@@ -4,7 +4,7 @@
 void test_junitxml_testsuite_read() {
     struct JUNIT_Testsuite *testsuite;
     char datafile[PATH_MAX] = {0};
-    snprintf(datafile, sizeof(datafile) - 1, "%s/result.xml", TEST_DATA_DIR);
+    snprintf(datafile, sizeof(datafile), "%s/result.xml", TEST_DATA_DIR);
 
     STASIS_ASSERT_FATAL((testsuite = junitxml_testsuite_read(datafile)) != NULL, "failed to load testsuite data");
     STASIS_ASSERT(testsuite->name != NULL, "Test suite must be named");
@@ -48,7 +48,7 @@ void test_junitxml_testsuite_read() {
 void test_junitxml_testsuite_read_error() {
     struct JUNIT_Testsuite *testsuite;
     char datafile[PATH_MAX] = {0};
-    snprintf(datafile, sizeof(datafile) - 1, "%s/result_error.xml", TEST_DATA_DIR);
+    snprintf(datafile, sizeof(datafile), "%s/result_error.xml", TEST_DATA_DIR);
     STASIS_ASSERT_FATAL((testsuite = junitxml_testsuite_read(datafile)) != NULL, "failed to load testsuite data");
 
     STASIS_ASSERT(testsuite->name != NULL, "test suite must be named");
diff --git a/tests/test_multiprocessing.c b/tests/test_multiprocessing.c
index 3b98b77..767a9e0 100644
--- a/tests/test_multiprocessing.c
+++ b/tests/test_multiprocessing.c
@@ -137,7 +137,7 @@ void test_mp_fail_fast() {
     for (size_t i = 0; i < sizeof(commands_ff) / sizeof(*commands_ff); i++) {
         char *command = commands_ff[i];
         char taskname[100] = {0};
-        snprintf(taskname, sizeof(taskname) - 1, "task_%03zu", i);
+        snprintf(taskname, sizeof(taskname), "task_%03zu", i);
         STASIS_ASSERT(mp_pool_task(p, taskname, NULL, (char *) command) != NULL, "Failed to queue task");
     }
 
diff --git a/tests/test_utils.c b/tests/test_utils.c
index 79bca43..7361139 100644
--- a/tests/test_utils.c
+++ b/tests/test_utils.c
@@ -147,7 +147,9 @@ void test_xmkstemp() {
 
     char buf[100] = {0};
     tempfp = fopen(tempfile, "r");
-    fgets(buf, sizeof(buf) - 1, tempfp);
+    const char *line = fgets(buf, sizeof(buf) - 1, tempfp);
+    STASIS_ASSERT_FATAL(line != NULL, "file should contain data written earlier");
+    STASIS_ASSERT(strcmp(line, buf) == 0, "file should contain the correct data");
     fclose(tempfp);
 
     STASIS_ASSERT(strcmp(buf, data) == 0, "data written to temp file is incorrect");