Merge pull request #1187 from xexyl/unused-arg

Author: lcn2

CHANGES.md

@@ -1,6 +1,13 @@
 # Major changes to the IOCCC entry toolkit
 
 
+## Release 2.3.44 2025-02-26
+
+Remove unused arg in `write_json_files()`.
+
+Updated `MKIOCCCENTRY_VERSION` to `"1.2.34 2025-02-26"`.
+
+
 ## Release 2.3.43 2025-02-25
 
 Improve `mkiocccentry_test.sh` - add only required files test.
@@ -59,9 +66,13 @@ FTS functions requires a minor update to chkentry (both in `chkentry.c` and
 `soup/entry_util.c`)  minor change or else it will not compile and also will
 likely segfault.
 
-Updated `MKIOCCCENTRY_VERSION` to `"1.2.33 2025-02-34"`.
+Updated `MKIOCCCENTRY_VERSION` to `"1.2.33 2025-02-24"`.
 Updated `CHKENTRY_VERSION` to `"1.1.4 2025-02-24"`.
 
+**NOTE**: the `MKIOCCCENTRY_VERSION` in this commit was by accident `"1.2.33
+2025-02-34"` but we have retroactively fixed it. Thus if you check out this
+specific commit you would see that the version is a mismatch here.
+
 
 ## Release 2.3.41 2025-02-23
 

mkiocccentry.c

@@ -805,7 +805,7 @@ main(int argc, char *argv[])
     if (!quiet) {
 	para("", "Forming the .auth.json file and .info json file ...", NULL);
     }
-    write_json_files(&auth, &info, submission_dir, chkentry, fnamchk);
+    write_json_files(&auth, &info, submission_dir, chkentry);
     if (!quiet) {
 	para("... completed .auth.json and .info.json files.", "", NULL);
     }
@@ -7530,21 +7530,19 @@ form_info(struct info *infop)
  * write_json_files
  *
  * Create the .auth.json and .info.json files and then verify them by running
- * chkentry(1) on them.
+ * chkentry(1) on the submission directory.
  *
  * given:
  *      authp           -   pointer to auth structure
  *      infop           -   pointer to info structure
  *      submission_dir  -   submission directory
  *      chkentry        -   path to chkentry(1) tool
- *      fnamchk         -   path to fnamchk(1) tool
  *
  * This function does not return if a NULL pointer is encountered, if certain
  * variables are not in the right range or if chkentry(1) fails.
  */
 static void
-write_json_files(struct auth *authp, struct info *infop, char const *submission_dir, char const *chkentry,
-        char const *fnamchk)
+write_json_files(struct auth *authp, struct info *infop, char const *submission_dir, char const *chkentry)
 {
     char *info_path;		/* path to .info.json file */
     size_t info_path_len;	/* length of path to .info.json */
@@ -7562,7 +7560,7 @@ write_json_files(struct auth *authp, struct info *infop, char const *submission_
     /*
      * firewall
      */
-    if (infop == NULL || authp == NULL || submission_dir == NULL || chkentry == NULL || fnamchk == NULL) {
+    if (infop == NULL || authp == NULL || submission_dir == NULL || chkentry == NULL) {
         err(20, __func__, "called with NULL arg(s)");
         not_reached();
     }
@@ -7883,7 +7881,7 @@ write_json_files(struct auth *authp, struct info *infop, char const *submission_
      */
     if (!quiet) {
 	para("",
-	    "Checking the format of .auth.json and .info.json ...", NULL);
+	    "Checking your submission directory for various issues ...", NULL);
     }
     dbg(DBG_HIGH, "about to perform: %s -q -- %s", chkentry, submission_dir);
     exit_code = shell_cmd(__func__, false, true, "% -q -- %", chkentry, submission_dir);
@@ -7893,7 +7891,7 @@ write_json_files(struct auth *authp, struct info *infop, char const *submission_
 	not_reached();
     }
     if (!quiet) {
-	para("... all appears well with the .auth.json and .info.json files.", NULL);
+	para("... all appears well with your submission directory.", NULL);
     }
 
     /*

mkiocccentry.h

@@ -179,8 +179,7 @@ static char *get_title(struct info *infop);
 static char *get_abstract(struct info *infop);
 static int get_author_info(struct author **author_set_p);
 static void verify_submission_dir(char const *submission_dir, char const *ls);
-static void write_json_files(struct auth *authp, struct info *infop, char const *submission_dir, char const *chkentry,
-        char const *fnamchk);
+static void write_json_files(struct auth *authp, struct info *infop, char const *submission_dir, char const *chkentry);
 static void form_auth(struct auth *authp, struct info *infop, int author_count, struct author *authorp);
 static void form_info(struct info *infop);
 static void form_tarball(char const *workdir, char const *submission_dir, char const *tarball_path, char const *tar,

soup/version.h

@@ -66,7 +66,7 @@
  *
  * NOTE: This should match the latest Release string in CHANGES.md
  */
-#define MKIOCCCENTRY_REPO_VERSION "2.3.43 2025-02-25"	/* special release format: major.minor[.patch] YYYY-MM-DD */
+#define MKIOCCCENTRY_REPO_VERSION "2.3.44 2025-02-26"	/* special release format: major.minor[.patch] YYYY-MM-DD */
 
 
 /*
@@ -82,7 +82,7 @@
 /*
  * official mkiocccentry versions (mkiocccentry itself and answers)
  */
-#define MKIOCCCENTRY_VERSION "1.2.33 2025-02-34"	/* format: major.minor YYYY-MM-DD */
+#define MKIOCCCENTRY_VERSION "1.2.34 2025-02-26"	/* format: major.minor YYYY-MM-DD */
 #define MKIOCCCENTRY_ANSWERS_VERSION "MKIOCCCENTRY_ANSWERS_IOCCC28-1.0" /* answers file version */
 #define MKIOCCCENTRY_ANSWERS_EOF "ANSWERS_EOF" /* answers file EOF marker */