@@ -805,7 +805,7 @@ main(int argc, char *argv[])
805
805
if (!quiet ) {
806
806
para ("" , "Forming the .auth.json file and .info json file ..." , NULL );
807
807
}
808
- write_json_files (& auth , & info , submission_dir , chkentry , fnamchk );
808
+ write_json_files (& auth , & info , submission_dir , chkentry );
809
809
if (!quiet ) {
810
810
para ("... completed .auth.json and .info.json files." , "" , NULL );
811
811
}
@@ -7530,21 +7530,19 @@ form_info(struct info *infop)
7530
7530
* write_json_files
7531
7531
*
7532
7532
* Create the .auth.json and .info.json files and then verify them by running
7533
- * chkentry(1) on them .
7533
+ * chkentry(1) on the submission directory .
7534
7534
*
7535
7535
* given:
7536
7536
* authp - pointer to auth structure
7537
7537
* infop - pointer to info structure
7538
7538
* submission_dir - submission directory
7539
7539
* chkentry - path to chkentry(1) tool
7540
- * fnamchk - path to fnamchk(1) tool
7541
7540
*
7542
7541
* This function does not return if a NULL pointer is encountered, if certain
7543
7542
* variables are not in the right range or if chkentry(1) fails.
7544
7543
*/
7545
7544
static void
7546
- write_json_files (struct auth * authp , struct info * infop , char const * submission_dir , char const * chkentry ,
7547
- char const * fnamchk )
7545
+ write_json_files (struct auth * authp , struct info * infop , char const * submission_dir , char const * chkentry )
7548
7546
{
7549
7547
char * info_path ; /* path to .info.json file */
7550
7548
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_
7562
7560
/*
7563
7561
* firewall
7564
7562
*/
7565
- if (infop == NULL || authp == NULL || submission_dir == NULL || chkentry == NULL || fnamchk == NULL ) {
7563
+ if (infop == NULL || authp == NULL || submission_dir == NULL || chkentry == NULL ) {
7566
7564
err (20 , __func__ , "called with NULL arg(s)" );
7567
7565
not_reached ();
7568
7566
}
@@ -7883,7 +7881,7 @@ write_json_files(struct auth *authp, struct info *infop, char const *submission_
7883
7881
*/
7884
7882
if (!quiet ) {
7885
7883
para ("" ,
7886
- "Checking the format of .auth.json and .info.json ..." , NULL );
7884
+ "Checking your submission directory for various issues ..." , NULL );
7887
7885
}
7888
7886
dbg (DBG_HIGH , "about to perform: %s -q -- %s" , chkentry , submission_dir );
7889
7887
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_
7893
7891
not_reached ();
7894
7892
}
7895
7893
if (!quiet ) {
7896
- para ("... all appears well with the .auth.json and .info.json files ." , NULL );
7894
+ para ("... all appears well with your submission directory ." , NULL );
7897
7895
}
7898
7896
7899
7897
/*
0 commit comments