Skip to content

Commit a12cef0

Browse files
authored
Merge pull request #56 from ixfd64/params-macros
convert default log file name to macro
2 parents 1a68c71 + 26e14d9 commit a12cef0

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/mfaktc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,7 @@ int main(int argc, char **argv)
11431143
{
11441144
if (my_read_string(mystuff.inifile, "LogFile", mystuff.logfile, 50))
11451145
{
1146-
sprintf(mystuff.logfile, "mfakto.log");
1146+
snprintf(mystuff.logfile, sizeof(mystuff.logfile), LOG_FILE);
11471147
}
11481148
mystuff.logfileptr = fopen(mystuff.logfile, "a");
11491149
}

src/params.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,11 @@ The following lines define the min, default and max value.
237237
#define MAX_FACTOR_BUFFER_LENGTH MAX_FACTORS_PER_JOB * MAX_DEZ_96_STRING_LENGTH
238238
#define MAX_BUFFER_LENGTH MAX_FACTOR_BUFFER_LENGTH + 100
239239

240-
/* other files */
240+
/* other files - names should not exceed 50 characters */
241241
#define CFG_FILE "mfakto.ini"
242242
#define RESULTS_FILE "results.txt"
243-
#define RESULTS_JSON_FILE "results.json.txt"
243+
#define RESULTS_JSON_FILE "results.json.txt"
244+
#define LOG_FILE "mfakto.log"
244245

245246
/* for GHz-day calculations */
246247
#define GHZDAYS_MAGIC_TF_TOP 0.016968 // magic constant for TF to 65 bits and above

src/read_config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ int read_config(mystuff_t *mystuff)
524524

525525
if (my_read_string(mystuff->inifile, "LogFile", mystuff->logfile, 50))
526526
{
527-
sprintf(mystuff->logfile, "mfakto.log");
527+
snprintf(mystuff->logfile, sizeof(mystuff->logfile), LOG_FILE);
528528
logprintf(mystuff, "Warning: Cannot read LogFile from INI file, using default (%s)\n", mystuff->logfile);
529529
}
530530
if (mystuff->verbosity >= 1)logprintf(mystuff, " LogFile %s\n", mystuff->logfile);

0 commit comments

Comments
 (0)