home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove redundant uses of NULL.
[plomrogue]
/
src
/
client
/
parse.c
diff --git
a/src/client/parse.c
b/src/client/parse.c
index 2767c46b55e8d9d5b0856cfd5c320731a0e63128..c233a9203eb210d29a4fc608f7bbd854a07ccfbc 100644
(file)
--- a/
src/client/parse.c
+++ b/
src/client/parse.c
@@
-1,6
+1,6
@@
/* src/client/parse.c */
/* src/client/parse.c */
-#define _POSIX_C_SOURCE 200809L /* strdup() */
+#define _POSIX_C_SOURCE 200809L /* strdup()
, snprintf()
*/
#include "parse.h"
#include <stddef.h> /* size_t, NULL */
#include <stdio.h> /* FILE, snprintf() */
#include "parse.h"
#include <stddef.h> /* size_t, NULL */
#include <stdio.h> /* FILE, snprintf() */
@@
-19,27
+19,25
@@
extern void parse_file(char * path, void (* token_to_entry) (char *, char *))
{
extern void parse_file(char * path, void (* token_to_entry) (char *, char *))
{
- char * f_name = "read_new_config_file()";
char * prefix = "Failed reading config file: \"";
char * affix = "\". ";
size_t size = strlen(prefix) + strlen(path) + strlen(affix) + 1;
char * prefix = "Failed reading config file: \"";
char * affix = "\". ";
size_t size = strlen(prefix) + strlen(path) + strlen(affix) + 1;
- char * errline_intro = try_malloc(size,
f_name
);
+ char * errline_intro = try_malloc(size,
__func__
);
int test = snprintf(errline_intro, size, "%s%s%s", prefix, path, affix);
int test = snprintf(errline_intro, size, "%s%s%s", prefix, path, affix);
- exit_trouble(test < 0,
f_name, "snprintf()
");
+ exit_trouble(test < 0,
__func__, "snprintf
");
exit_err(access(path, F_OK), errline_intro);
exit_err(access(path, F_OK), errline_intro);
- FILE * file = try_fopen(path, "r",
f_name
);
+ FILE * file = try_fopen(path, "r",
__func__
);
uint32_t linemax = textfile_width(file);
uint32_t linemax = textfile_width(file);
- char * errline_line = try_malloc(linemax + 1,
f_name
);
+ char * errline_line = try_malloc(linemax + 1,
__func__
);
set_err_line_options(errline_intro, errline_line, 1);
err_line_zero();
set_err_line_options(errline_intro, errline_line, 1);
err_line_zero();
- err_line(
0 ==
linemax, "File is empty.");
+ err_line(
!
linemax, "File is empty.");
char * token0 = NULL; /* For final token_to_entry() if while() stagnates. */
char * token1 = NULL;
char * err_val = "No value given.";
char * token0 = NULL; /* For final token_to_entry() if while() stagnates. */
char * token1 = NULL;
char * err_val = "No value given.";
- while (try_fgets(errline_line, linemax + 1, file,
f_name
))
+ while (try_fgets(errline_line, linemax + 1, file,
__func__
))
{
err_line_inc();
{
err_line_inc();
- // err_line(UINT32_MAX == err_line_count, "Line reaches max lines limit.");
char * line_copy = strdup(errline_line);
token0 = token_from_line(line_copy);
if (token0)
char * line_copy = strdup(errline_line);
token0 = token_from_line(line_copy);
if (token0)
@@
-51,7
+49,7
@@
extern void parse_file(char * path, void (* token_to_entry) (char *, char *))
free(line_copy);
}
token_to_entry(token0, token1);
free(line_copy);
}
token_to_entry(token0, token1);
- try_fclose(file,
f_name
);
+ try_fclose(file,
__func__
);
free(errline_line);
free(errline_intro);
}
free(errline_line);
free(errline_intro);
}
@@
-67,7
+65,7
@@
extern void parsetest_defcontext(uint8_t flags)
extern void parsetest_too_many_values()
{
extern void parsetest_too_many_values()
{
- err_line(
NULL != token_from_line(NULL
), "Too many values.");
+ err_line(
!(!token_from_line(NULL)
), "Too many values.");
}
}
@@
-88,9
+86,8
@@
extern void parse_unknown_arg()
extern char * parse_init_entry(uint8_t * flags, size_t size)
{
extern char * parse_init_entry(uint8_t * flags, size_t size)
{
- char * f_name = "parse_init_entry()";
*flags = EDIT_STARTED;
*flags = EDIT_STARTED;
- char * p = try_malloc(size,
f_name
);
+ char * p = try_malloc(size,
__func__
);
memset(p, 0, size);
return p;
}
memset(p, 0, size);
return p;
}