aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Łyszczek <michal.lyszczek@bofc.pl>2017-08-23 14:23:24 +0200
committerMichał Łyszczek <michal.lyszczek@bofc.pl>2017-08-23 14:23:24 +0200
commit5ac4a26f2cf07daf4e0ba0306558920feaf6fabb (patch)
tree7e8fe80d50dca214b149a597f21c41a32b75d102
parentdb0eb6c5ab6b77b5c777643ffad90e71030e7e2e (diff)
downloadembedlog-5ac4a26f2cf07daf4e0ba0306558920feaf6fabb.tar.gz
embedlog-5ac4a26f2cf07daf4e0ba0306558920feaf6fabb.tar.bz2
embedlog-5ac4a26f2cf07daf4e0ba0306558920feaf6fabb.zip
Changed function names to be more consistent
-rw-r--r--src/Makefile.am2
-rw-r--r--src/el-options.c4
-rw-r--r--src/el-perror.c4
-rw-r--r--src/el-print.c8
4 files changed, 9 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index cfbf28b..5041280 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@ if ENABLE_OUT_FILE
test_SOURCES += el-file.c
endif
-test_CFLAGS = -I$(top_srcdir)/include -O0 -g3 -ggdb
+test_CFLAGS = -I$(top_srcdir)/include -O0 -g3 -ggdb -DNDEBUG
TESTS = $(check_PROGRAMS)
LOG_DRIVER = $(top_srcdir)/tap-driver
diff --git a/src/el-options.c b/src/el-options.c
index b68947a..ac76ade 100644
--- a/src/el-options.c
+++ b/src/el-options.c
@@ -255,7 +255,7 @@ static int el_vooption
int el_init(void)
{
- return el_options_init(&g_options);
+ return el_oinit(&g_options);
}
@@ -267,7 +267,7 @@ int el_init(void)
========================================================================== */
-int el_options_init
+int el_oinit
(
struct el_options *options /* options object */
)
diff --git a/src/el-perror.c b/src/el-perror.c
index 3231e47..d5a3b69 100644
--- a/src/el-perror.c
+++ b/src/el-perror.c
@@ -72,7 +72,7 @@ int el_perror
e = errno;
va_start(ap, fmt);
- rc = el_voprint(level, file, num, &g_options, fmt, ap);
+ rc = el_ovprint(level, file, num, &g_options, fmt, ap);
rc |= el_oprint(level, file, num, &g_options,
"errno num: %lu, strerror: %s", e, strerror(e));
va_end(ap);
@@ -103,7 +103,7 @@ int el_operror
e = errno;
va_start(ap, fmt);
- rc = el_voprint(level, file, num, options, fmt, ap);
+ rc = el_ovprint(level, file, num, options, fmt, ap);
rc |= el_oprint(level, file, num, options,
"errno num: %lu, strerror: %s", e, strerror(e));
va_end(ap);
diff --git a/src/el-print.c b/src/el-print.c
index 31c387d..c4b85a6 100644
--- a/src/el-print.c
+++ b/src/el-print.c
@@ -444,7 +444,7 @@ int el_print
va_start(ap, fmt);
- rc = el_voprint(level, file, num, &g_options, fmt, ap);
+ rc = el_ovprint(level, file, num, &g_options, fmt, ap);
va_end(ap);
return rc;
@@ -472,7 +472,7 @@ int el_oprint
va_start(ap, fmt);
- rc = el_voprint(level, file, num, options, fmt, ap);
+ rc = el_ovprint(level, file, num, options, fmt, ap);
va_end(ap);
return rc;
@@ -493,7 +493,7 @@ int el_vprint
va_list ap /* additional parameters for fmt */
)
{
- return el_voprint(level, file, num, &g_options, fmt, ap);
+ return el_ovprint(level, file, num, &g_options, fmt, ap);
}
@@ -513,7 +513,7 @@ int el_vprint
========================================================================== */
-int el_voprint
+int el_ovprint
(
enum el_level level, /* log level to print log with */
const char *file, /* file name to print in log */