change: shortened option enums, who wants to type so much?

10 files changed, 215 insertions, 215 deletions

diff --git a/include/embedlog.h b/include/embedlog.h
index 281b6f2..b7fd111 100644
--- a/include/embedlog.h
+++ b/include/embedlog.h
@@ -41,14 +41,14 @@
 
 enum el_output
 {
-    EL_OPT_OUT_NONE   = 0x0000,
-    EL_OPT_OUT_STDERR = 0x0001,
-    EL_OPT_OUT_SYSLOG = 0x0002,
-    EL_OPT_OUT_FILE   = 0x0004,
-    EL_OPT_OUT_NET    = 0x0008,
-    EL_OPT_OUT_TTY    = 0x0010,
-    EL_OPT_OUT_CUSTOM = 0x0020,
-    EL_OPT_OUT_ALL    = 0x003f,
+    EL_OUT_NONE   = 0x0000,
+    EL_OUT_STDERR = 0x0001,
+    EL_OUT_SYSLOG = 0x0002,
+    EL_OUT_FILE   = 0x0004,
+    EL_OUT_NET    = 0x0008,
+    EL_OUT_TTY    = 0x0010,
+    EL_OUT_CUSTOM = 0x0020,
+    EL_OUT_ALL    = 0x003f,
 };
 
 enum el_level
@@ -65,39 +65,39 @@ enum el_level
 
 enum el_option
 {
-    EL_OPT_LEVEL,
-    EL_OPT_OUT,
-    EL_OPT_COLORS,
-    EL_OPT_TS,
-    EL_OPT_TS_TM,
-    EL_OPT_PRINT_LEVEL,
-    EL_OPT_FINFO,
-    EL_OPT_CUSTOM_PUTS,
-
-    EL_OPT_FNAME,
-    EL_OPT_FROTATE_NUMBER,
-    EL_OPT_FROTATE_SIZE,
+    EL_LEVEL,
+    EL_OUT,
+    EL_COLORS,
+    EL_TS,
+    EL_TS_TM,
+    EL_PRINT_LEVEL,
+    EL_FINFO,
+    EL_CUSTOM_PUTS,
+
+    EL_FNAME,
+    EL_FROTATE_NUMBER,
+    EL_FROTATE_SIZE,
 
     EL_OPT_ERROR /* internal use only */
 };
 
 enum el_option_timestamp
 {
-    EL_OPT_TS_OFF,
-    EL_OPT_TS_SHORT,
-    EL_OPT_TS_LONG,
+    EL_TS_OFF,
+    EL_TS_SHORT,
+    EL_TS_LONG,
 
-    EL_OPT_TS_ERROR /* internal use only */
+    EL_TS_ERROR /* internal use only */
 };
 
 enum el_option_timestamp_timer
 {
-    EL_OPT_TS_TM_CLOCK,
-    EL_OPT_TS_TM_TIME,
-    EL_OPT_TS_TM_REALTIME,
-    EL_OPT_TS_TM_MONOTONIC,
+    EL_TS_TM_CLOCK,
+    EL_TS_TM_TIME,
+    EL_TS_TM_REALTIME,
+    EL_TS_TM_MONOTONIC,
 
-    EL_OPT_TS_TM_ERROR /* internal use only */
+    EL_TS_TM_ERROR /* internal use only */
 };
 
 typedef int (*el_custom_puts)(const char *s);
diff --git a/src/el-file.c b/src/el-file.c
index d6fc041..fd5d916 100644
--- a/src/el-file.c
+++ b/src/el-file.c
@@ -255,7 +255,7 @@ int el_file_open
         /*
          * to prevent any memory leak in  case  of  double  open,  we  first
          * close already opened file Such situation may happen when  library
-         * user changes file name using EL_OPT_FNAME option,
+         * user changes file name using EL_FNAME option,
          */
 
         fclose(options->file);
diff --git a/src/el-options.c b/src/el-options.c
index ad0f73d..3a6470e 100644
--- a/src/el-options.c
+++ b/src/el-options.c
@@ -84,27 +84,27 @@ struct el_options g_options;
 static const int VALID_OUTS = 0
 
 #if ENABLE_OUT_STDERR
-    | EL_OPT_OUT_STDERR
+    | EL_OUT_STDERR
 #endif
 
 #if ENABLE_OUT_SYSLOG
-    | EL_OPT_OUT_SYSLOG
+    | EL_OUT_SYSLOG
 #endif
 
 #if ENABLE_OUT_FILE
-    | EL_OPT_OUT_FILE
+    | EL_OUT_FILE
 #endif
 
 #if ENABLE_OUT_NET
-    | EL_OPT_OUT_NET
+    | EL_OUT_NET
 #endif
 
 #if ENABLE_OUT_TTY
-    | EL_OPT_OUT_TTY
+    | EL_OUT_TTY
 #endif
 
 #if ENABLE_OUT_CUSTOM
-    | EL_OPT_OUT_CUSTOM
+    | EL_OUT_CUSTOM
 #endif
     ;
 
@@ -153,19 +153,19 @@ static int el_vooption
 
     switch (option)
     {
-    case EL_OPT_LEVEL:
+    case EL_LEVEL:
         value_int = va_arg(ap, int);
         options->level = value_int;
         return 0;
 
-    case EL_OPT_OUT:
+    case EL_OUT:
         value_int = va_arg(ap, int);
-        VALID(EINVAL, (value_int & ~EL_OPT_OUT_ALL) == 0x00);
+        VALID(EINVAL, (value_int & ~EL_OUT_ALL) == 0x00);
         VALID(ENODEV, (value_int & ~VALID_OUTS) == 0x00);
         options->outputs = value_int;
         return 0;
 
-    case EL_OPT_PRINT_LEVEL:
+    case EL_PRINT_LEVEL:
         value_int = va_arg(ap, int);
         VALID(EINVAL, (value_int & ~1) == 0);
 
@@ -174,7 +174,7 @@ static int el_vooption
 
     #if ENABLE_COLORS
 
-    case EL_OPT_COLORS:
+    case EL_COLORS:
         /*
          * only 1 or 0 is allowed, if any other bit is set return EINVAL
          */
@@ -189,16 +189,16 @@ static int el_vooption
 
     #if ENABLE_TIMESTAMP
 
-    case EL_OPT_TS:
+    case EL_TS:
         value_int = va_arg(ap, int);
-        VALID(EINVAL, 0 <= value_int && value_int < EL_OPT_TS_ERROR);
+        VALID(EINVAL, 0 <= value_int && value_int < EL_TS_ERROR);
 
         options->timestamp = value_int;
         return 0;
 
-    case EL_OPT_TS_TM:
+    case EL_TS_TM:
         value_int = va_arg(ap, int);
-        VALID(EINVAL, 0 <= value_int && value_int < EL_OPT_TS_TM_ERROR);
+        VALID(EINVAL, 0 <= value_int && value_int < EL_TS_TM_ERROR);
 
         options->timestamp_timer = value_int;
         return 0;
@@ -207,7 +207,7 @@ static int el_vooption
 
     #if ENABLE_FINFO
 
-    case EL_OPT_FINFO:
+    case EL_FINFO:
         value_int = va_arg(ap, int);
         VALID(EINVAL, (value_int & ~1) == 0);
 
@@ -218,13 +218,13 @@ static int el_vooption
 
     #if ENABLE_OUT_FILE
 
-    case EL_OPT_FNAME:
+    case EL_FNAME:
         value_str = va_arg(ap, const char *);
         VALID(EINVAL, value_str);
         options->fname = value_str;
         return el_file_open(options);
 
-    case EL_OPT_FROTATE_NUMBER:
+    case EL_FROTATE_NUMBER:
     {
         int previous_frotate; /* previous value of frotate number */
         /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -251,7 +251,7 @@ static int el_vooption
         return 0;
     }
 
-    case EL_OPT_FROTATE_SIZE:
+    case EL_FROTATE_SIZE:
         value_long = va_arg(ap, long);
         VALID(EINVAL, value_long >= 1);
         options->frotate_size = value_long;
@@ -261,7 +261,7 @@ static int el_vooption
 
     #if ENABLE_OUT_CUSTOM
 
-    case EL_OPT_CUSTOM_PUTS:
+    case EL_CUSTOM_PUTS:
         value_ptr = va_arg(ap, void (*)());
         options->custom_puts = (el_custom_puts)value_ptr;
         return 0;
diff --git a/src/el-print.c b/src/el-print.c
index 4b36e02..a4b321b 100644
--- a/src/el-print.c
+++ b/src/el-print.c
@@ -243,7 +243,7 @@ static size_t el_timestamp
     size_t           tl;       /* timestamp length */
     /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-    if (options->timestamp == EL_OPT_TS_OFF)
+    if (options->timestamp == EL_TS_OFF)
     {
         /*
          * user doesn't want us to print timestamp, that's fine
@@ -260,7 +260,7 @@ static size_t el_timestamp
     {
 #if ENABLE_REALTIME
 
-    case EL_OPT_TS_TM_REALTIME:
+    case EL_TS_TM_REALTIME:
         el_ts_clock_gettime(&s, &us, CLOCK_REALTIME);
         break;
 
@@ -268,17 +268,17 @@ static size_t el_timestamp
 
 #if ENABLE_MONOTONIC
 
-    case EL_OPT_TS_TM_MONOTONIC:
+    case EL_TS_TM_MONOTONIC:
         el_ts_clock_gettime(&s, &us, CLOCK_MONOTONIC);
         break;
 
 #endif
 
-    case EL_OPT_TS_TM_TIME:
+    case EL_TS_TM_TIME:
         el_ts_time(&s, &us);
         break;
 
-    case EL_OPT_TS_TM_CLOCK:
+    case EL_TS_TM_CLOCK:
         el_ts_clock(&s, &us);
         break;
 
@@ -294,7 +294,7 @@ static size_t el_timestamp
      * then convert retrieved time into string timestamp
      */
 
-    if (options->timestamp == EL_OPT_TS_LONG)
+    if (options->timestamp == EL_TS_LONG)
     {
         struct tm   tm;   /* timestamp splitted */
         struct tm  *tmp;  /* timestamp splitted pointer */
diff --git a/src/el-puts.c b/src/el-puts.c
index 7156e04..1f02d39 100644
--- a/src/el-puts.c
+++ b/src/el-puts.c
@@ -98,40 +98,40 @@ int el_oputs
     }
 
 #if ENABLE_OUT_STDERR
-    if (options->outputs & EL_OPT_OUT_STDERR)
+    if (options->outputs & EL_OUT_STDERR)
     {
         rv |= fputs(s, stderr) == EOF ? -1 : 0;
     }
 #endif
 
 #if 0 /* TODO */
-    if (options->outputs & EL_OPT_OUT_SYSLOG)
+    if (options->outputs & EL_OUT_SYSLOG)
     {
         el_puts_syslog(s);
     }
 #endif
 
 #if ENABLE_OUT_FILE
-    if (options->outputs & EL_OPT_OUT_FILE)
+    if (options->outputs & EL_OUT_FILE)
     {
         rv |= el_file_puts(options, s);
     }
 #endif
 
 #if 0
-    if (options->outputs & EL_OPT_OUT_NET)
+    if (options->outputs & EL_OUT_NET)
     {
         el_puts_net(s);
     }
 
-    if (options->outputs & EL_OPT_OUT_TTY)
+    if (options->outputs & EL_OUT_TTY)
     {
         el_puts_tty(s);
     }
 #endif
 
 #if ENABLE_OUT_CUSTOM
-    if (options->outputs & EL_OPT_OUT_CUSTOM && options->custom_puts)
+    if (options->outputs & EL_OUT_CUSTOM && options->custom_puts)
     {
         rv |= options->custom_puts(s);
     }
diff --git a/tst/el-file.c b/tst/el-file.c
index 8a91310..a74b113 100644
--- a/tst/el-file.c
+++ b/tst/el-file.c
@@ -100,10 +100,10 @@ static int file_check
 static void test_prepare(void)
 {
     el_init();
-    el_option(EL_OPT_OUT, EL_OPT_OUT_FILE);
-    el_option(EL_OPT_FROTATE_SIZE, 16);
-    el_option(EL_OPT_FROTATE_NUMBER, 0);
-    el_option(EL_OPT_FNAME, WORKDIR"/log");
+    el_option(EL_OUT, EL_OUT_FILE);
+    el_option(EL_FROTATE_SIZE, 16);
+    el_option(EL_FROTATE_NUMBER, 0);
+    el_option(EL_FNAME, WORKDIR"/log");
 
 }
 
@@ -184,10 +184,10 @@ static void file_reopen(void)
     el_cleanup();
 
     el_init();
-    el_option(EL_OPT_OUT, EL_OPT_OUT_FILE);
-    el_option(EL_OPT_FROTATE_SIZE, 16);
-    el_option(EL_OPT_FROTATE_NUMBER, 0);
-    el_option(EL_OPT_FNAME, WORKDIR"/log");
+    el_option(EL_OUT, EL_OUT_FILE);
+    el_option(EL_FROTATE_SIZE, 16);
+    el_option(EL_FROTATE_NUMBER, 0);
+    el_option(EL_FNAME, WORKDIR"/log");
 
     el_puts(s8);
     mt_fok(file_check(WORKDIR"/log", s9 s8));
@@ -204,10 +204,10 @@ static void file_reopen_different_file(void)
     el_cleanup();
 
     el_init();
-    el_option(EL_OPT_OUT, EL_OPT_OUT_FILE);
-    el_option(EL_OPT_FROTATE_SIZE, 16);
-    el_option(EL_OPT_FROTATE_NUMBER, 0);
-    el_option(EL_OPT_FNAME, WORKDIR"/log-another");
+    el_option(EL_OUT, EL_OUT_FILE);
+    el_option(EL_FROTATE_SIZE, 16);
+    el_option(EL_FROTATE_NUMBER, 0);
+    el_option(EL_FNAME, WORKDIR"/log-another");
 
     el_puts(s8);
     mt_fok(file_check(WORKDIR"/log", s9));
@@ -240,7 +240,7 @@ static void file_filename_too_long(void)
 
     memset(path, 'a', sizeof(path));
     path[sizeof(path) - 1] = '\0';
-    mt_ferr(el_option(EL_OPT_FNAME, path), ENAMETOOLONG);
+    mt_ferr(el_option(EL_FNAME, path), ENAMETOOLONG);
 }
 
 
@@ -262,7 +262,7 @@ static void file_path_too_long(void)
     path[sizeof(path) - 3] = 'l';
     path[sizeof(path) - 2] = 'e';
     path[sizeof(path) - 1] = '\0';
-    mt_ferr(el_option(EL_OPT_FNAME, path), ENAMETOOLONG);
+    mt_ferr(el_option(EL_FNAME, path), ENAMETOOLONG);
 }
 
 
@@ -283,10 +283,10 @@ static void file_print_without_init(void)
 static void file_print_after_cleanup(void)
 {
     el_init();
-    el_option(EL_OPT_OUT, EL_OPT_OUT_FILE);
-    el_option(EL_OPT_FROTATE_SIZE, 16);
-    el_option(EL_OPT_FROTATE_NUMBER, 0);
-    el_option(EL_OPT_FNAME, WORKDIR"/log");
+    el_option(EL_OUT, EL_OUT_FILE);
+    el_option(EL_FROTATE_SIZE, 16);
+    el_option(EL_FROTATE_NUMBER, 0);
+    el_option(EL_FNAME, WORKDIR"/log");
     el_cleanup();
     mt_ferr(el_puts("whatev"), ENODEV);
 }
@@ -299,9 +299,9 @@ static void file_print_after_cleanup(void)
 static void file_print_without_setting_file(void)
 {
     el_init();
-    el_option(EL_OPT_OUT, EL_OPT_OUT_FILE);
-    el_option(EL_OPT_FROTATE_SIZE, 16);
-    el_option(EL_OPT_FROTATE_NUMBER, 0);
+    el_option(EL_OUT, EL_OUT_FILE);
+    el_option(EL_FROTATE_SIZE, 16);
+    el_option(EL_FROTATE_NUMBER, 0);
     mt_ferr(el_puts("no file set"), EBADF);
     el_cleanup();
 }
@@ -313,7 +313,7 @@ static void file_print_without_setting_file(void)
 
 static void file_rotate_1_no_rotate(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 1);
+    el_option(EL_FROTATE_NUMBER, 1);
     el_puts(s9);
     mt_fok(file_check(WORKDIR"/log.0", s9));
 }
@@ -325,7 +325,7 @@ static void file_rotate_1_no_rotate(void)
 
 static void file_rotate_1_exact_print(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 1);
+    el_option(EL_FROTATE_NUMBER, 1);
     el_puts(s8);
     el_puts(s8);
     mt_fok(file_check(WORKDIR"/log.0", s8 s8));
@@ -339,7 +339,7 @@ static void file_rotate_1_exact_print(void)
 
 static void file_rotate_1_overflow_but_no_rotate(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 1);
+    el_option(EL_FROTATE_NUMBER, 1);
     el_puts(s9 s5 s5);
     mt_fok(file_check(WORKDIR"/log.0", s9 s5 "qw"));
     mt_fail(access(WORKDIR"/log.1", F_OK) == -1);
@@ -352,7 +352,7 @@ static void file_rotate_1_overflow_but_no_rotate(void)
 
 static void file_rotate_1_overflow(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 1);
+    el_option(EL_FROTATE_NUMBER, 1);
     el_puts(s9);
     el_puts(s9);
     el_puts(s3);
@@ -367,7 +367,7 @@ static void file_rotate_1_overflow(void)
 
 static void file_rotate_1_overflow_exact(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 1);
+    el_option(EL_FROTATE_NUMBER, 1);
     el_puts(s8);
     el_puts(s8);
     el_puts(s5);
@@ -382,15 +382,15 @@ static void file_rotate_1_overflow_exact(void)
 
 static void file_rotate_1_reopen(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 1);
+    el_option(EL_FROTATE_NUMBER, 1);
     el_puts(s5);
 
     el_cleanup();
     el_init();
-    el_option(EL_OPT_OUT, EL_OPT_OUT_FILE);
-    el_option(EL_OPT_FROTATE_SIZE, 16);
-    el_option(EL_OPT_FROTATE_NUMBER, 1);
-    el_option(EL_OPT_FNAME, WORKDIR"/log");
+    el_option(EL_OUT, EL_OUT_FILE);
+    el_option(EL_FROTATE_SIZE, 16);
+    el_option(EL_FROTATE_NUMBER, 1);
+    el_option(EL_FNAME, WORKDIR"/log");
 
     el_puts(s8);
     mt_fok(file_check(WORKDIR"/log.0", s5 s8));
@@ -404,7 +404,7 @@ static void file_rotate_1_reopen(void)
 
 static void file_rotate_1_unexpected_third_party_remove(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 1);
+    el_option(EL_FROTATE_NUMBER, 1);
     el_puts(s5);
     el_puts(s8);
     unlink(WORKDIR"/log.0");
@@ -421,10 +421,10 @@ static void file_rotate_1_unexpected_third_party_remove(void)
 
 static void file_rotate_1_change_size_up(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 1);
+    el_option(EL_FROTATE_NUMBER, 1);
     el_puts(s9);
     el_puts(s5);
-    el_option(EL_OPT_FROTATE_SIZE, 32);
+    el_option(EL_FROTATE_SIZE, 32);
     el_puts(s9);
     el_puts(s8);
     mt_fok(file_check(WORKDIR"/log.0", s9 s5 s9 s8));
@@ -438,9 +438,9 @@ static void file_rotate_1_change_size_up(void)
 
 static void file_rotate_1_change_size_down(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 1);
+    el_option(EL_FROTATE_NUMBER, 1);
     el_puts(s9);
-    el_option(EL_OPT_FROTATE_SIZE, 8);
+    el_option(EL_FROTATE_SIZE, 8);
     el_puts(s5);
     mt_fok(file_check(WORKDIR"/log.0", s5));
     mt_fail(access(WORKDIR"/log.1", F_OK) == -1);
@@ -453,7 +453,7 @@ static void file_rotate_1_change_size_down(void)
 
 static void file_rotate_2_no_rotate(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 2);
+    el_option(EL_FROTATE_NUMBER, 2);
     el_puts(s9);
     mt_fok(file_check(WORKDIR"/log.0", s9));
     mt_fail(access(WORKDIR"/log.1", F_OK) == -1);
@@ -466,7 +466,7 @@ static void file_rotate_2_no_rotate(void)
 
 static void file_rotate_2_exact_print(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 2);
+    el_option(EL_FROTATE_NUMBER, 2);
     el_puts(s8);
     el_puts(s8);
     mt_fok(file_check(WORKDIR"/log.0", s8 s8));
@@ -480,7 +480,7 @@ static void file_rotate_2_exact_print(void)
 
 static void file_rotate_2_overflow_but_no_rotate(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 2);
+    el_option(EL_FROTATE_NUMBER, 2);
     el_puts(s9 s5 s5);
     mt_fok(file_check(WORKDIR"/log.0", s9 s5 "qw"));
     mt_fail(access(WORKDIR"/log.1", F_OK) == -1);
@@ -493,7 +493,7 @@ static void file_rotate_2_overflow_but_no_rotate(void)
 
 static void file_rotate_2_overflow(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 2);
+    el_option(EL_FROTATE_NUMBER, 2);
     el_puts(s9);
     el_puts(s9);
     el_puts(s3);
@@ -508,7 +508,7 @@ static void file_rotate_2_overflow(void)
 
 static void file_rotate_2_overflow_exact(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 2);
+    el_option(EL_FROTATE_NUMBER, 2);
     el_puts(s8);
     el_puts(s8);
     el_puts(s5);
@@ -523,16 +523,16 @@ static void file_rotate_2_overflow_exact(void)
 
 static void file_rotate_2_reopen(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 2);
+    el_option(EL_FROTATE_NUMBER, 2);
     el_puts(s9);
     el_puts(s8);
 
     el_cleanup();
     el_init();
-    el_option(EL_OPT_OUT, EL_OPT_OUT_FILE);
-    el_option(EL_OPT_FROTATE_SIZE, 16);
-    el_option(EL_OPT_FROTATE_NUMBER, 2);
-    el_option(EL_OPT_FNAME, WORKDIR"/log");
+    el_option(EL_OUT, EL_OUT_FILE);
+    el_option(EL_FROTATE_SIZE, 16);
+    el_option(EL_FROTATE_NUMBER, 2);
+    el_option(EL_FNAME, WORKDIR"/log");
 
     el_puts(s5);
     mt_fok(file_check(WORKDIR"/log.0", s9));
@@ -546,7 +546,7 @@ static void file_rotate_2_reopen(void)
 
 static void file_rotate_2_unexpected_third_party_remove(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 2);
+    el_option(EL_FROTATE_NUMBER, 2);
     el_puts(s5);
     el_puts(s8);
     unlink(WORKDIR"/log.0");
@@ -564,11 +564,11 @@ static void file_rotate_2_unexpected_third_party_remove(void)
 
 static void file_rotate_2_change_size_up(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 2);
+    el_option(EL_FROTATE_NUMBER, 2);
     el_puts(s9);
     el_puts(s5);
     el_puts(s9);
-    el_option(EL_OPT_FROTATE_SIZE, 32);
+    el_option(EL_FROTATE_SIZE, 32);
     el_puts(s9);
     el_puts(s8);
     mt_fok(file_check(WORKDIR"/log.0", s9 s5));
@@ -582,10 +582,10 @@ static void file_rotate_2_change_size_up(void)
 
 static void file_rotate_2_change_size_down(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 2);
+    el_option(EL_FROTATE_NUMBER, 2);
     el_puts(s9);
     el_puts(s9);
-    el_option(EL_OPT_FROTATE_SIZE, 8);
+    el_option(EL_FROTATE_SIZE, 8);
     el_puts(s5);
     mt_fok(file_check(WORKDIR"/log.0", s9));
     mt_fok(file_check(WORKDIR"/log.1", s5));
@@ -598,7 +598,7 @@ static void file_rotate_2_change_size_down(void)
 
 static void file_rotate_2_many_rotates(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 2);
+    el_option(EL_FROTATE_NUMBER, 2);
     el_puts(s9);
     el_puts(s8);
     el_puts(s5);
@@ -616,7 +616,7 @@ static void file_rotate_2_many_rotates(void)
 
 static void file_rotate_5_no_rotate(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
+    el_option(EL_FROTATE_NUMBER, 5);
     el_puts(s9);
     mt_fok(file_check(WORKDIR"/log.0", s9));
     mt_fail(access(WORKDIR"/log.1", F_OK) == -1);
@@ -629,7 +629,7 @@ static void file_rotate_5_no_rotate(void)
 
 static void file_rotate_5_exact_print_rotate(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
+    el_option(EL_FROTATE_NUMBER, 5);
     el_puts(s8);
     el_puts(s8);
     el_puts(s8);
@@ -645,7 +645,7 @@ static void file_rotate_5_exact_print_rotate(void)
 
 static void file_rotate_5_overflow_but_no_rotate(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
+    el_option(EL_FROTATE_NUMBER, 5);
     el_puts(s8);
     el_puts(s8);
     el_puts(s9 s5 s5);
@@ -660,7 +660,7 @@ static void file_rotate_5_overflow_but_no_rotate(void)
 
 static void file_rotate_5_overflow(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
+    el_option(EL_FROTATE_NUMBER, 5);
     el_puts(s9);
     el_puts(s9);
     el_puts(s3);
@@ -681,7 +681,7 @@ static void file_rotate_5_overflow(void)
 
 static void file_rotate_5_overflow_exact(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
+    el_option(EL_FROTATE_NUMBER, 5);
     el_puts(s8);
     el_puts(s8);
     el_puts(s8);
@@ -699,7 +699,7 @@ static void file_rotate_5_overflow_exact(void)
 
 static void file_rotate_5_reopen(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
+    el_option(EL_FROTATE_NUMBER, 5);
 
     el_puts(s9);
     el_puts(s9);
@@ -710,10 +710,10 @@ static void file_rotate_5_reopen(void)
 
     el_cleanup();
     el_init();
-    el_option(EL_OPT_OUT, EL_OPT_OUT_FILE);
-    el_option(EL_OPT_FROTATE_SIZE, 16);
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
-    el_option(EL_OPT_FNAME, WORKDIR"/log");
+    el_option(EL_OUT, EL_OUT_FILE);
+    el_option(EL_FROTATE_SIZE, 16);
+    el_option(EL_FROTATE_NUMBER, 5);
+    el_option(EL_FNAME, WORKDIR"/log");
 
     el_puts(s9);
     el_puts(s8);
@@ -731,8 +731,8 @@ static void file_rotate_5_reopen(void)
 
 static void file_rotate_5_hole_in_log_rotate(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
-    el_option(EL_OPT_FROTATE_SIZE, 3);
+    el_option(EL_FROTATE_NUMBER, 5);
+    el_option(EL_FROTATE_SIZE, 3);
     el_puts("qaz");
     el_puts("wsx");
     el_puts("edc");
@@ -793,15 +793,15 @@ static void file_rotate_5_hole_in_log_rotate(void)
 
 static void file_rotate_5_rename_file_halfway(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
-    el_option(EL_OPT_FROTATE_SIZE, 3);
+    el_option(EL_FROTATE_NUMBER, 5);
+    el_option(EL_FROTATE_SIZE, 3);
     el_puts("qaz");
     el_puts("wsx");
     el_puts("edc");
     el_puts("rfv");
     el_puts("tgb");
 
-    el_option(EL_OPT_FNAME, WORKDIR"/log-another");
+    el_option(EL_FNAME, WORKDIR"/log-another");
 
     el_puts("123");
     el_puts("456");
@@ -829,7 +829,7 @@ static void file_rotate_5_rename_file_halfway(void)
 
 static void file_no_dir_for_logs(void)
 {
-    mt_ferr(el_option(EL_OPT_FNAME, "/tmp/i-dont/exist"), ENOENT);
+    mt_ferr(el_option(EL_FNAME, "/tmp/i-dont/exist"), ENOENT);
     mt_ferr(el_puts("whatever"), EBADF);
 }
 
@@ -862,13 +862,13 @@ static void file_dir_no_access(void)
          * root just doesn't give a fuck about no-write-permissions
          */
 
-        mt_fok(el_option(EL_OPT_FNAME, "/tmp/embedlog-no-write/log"));
+        mt_fok(el_option(EL_FNAME, "/tmp/embedlog-no-write/log"));
         mt_fok(el_puts(s3));
         mt_fok(file_check("/tmp/embedlog-no-write/log", s3));
     }
     else
     {
-        mt_ferr(el_option(EL_OPT_FNAME, "/tmp/embedlog-no-write/log"), EACCES);
+        mt_ferr(el_option(EL_FNAME, "/tmp/embedlog-no-write/log"), EACCES);
         mt_ferr(el_puts(s3), EBADF);
     }
     unlink("/tmp/embedlog-no-write/log");
@@ -892,13 +892,13 @@ static void file_no_access_to_file(void)
 
     if (getuid() == 0)
     {
-        mt_fok(el_option(EL_OPT_FNAME, "/tmp/embedlog-no-write/log"));
+        mt_fok(el_option(EL_FNAME, "/tmp/embedlog-no-write/log"));
         mt_fok(el_puts(s5));
         mt_fok(file_check("/tmp/embedlog-no-write/log", s5));
     }
     else
     {
-        mt_ferr(el_option(EL_OPT_FNAME, "/tmp/embedlog-no-write/log"), EACCES);
+        mt_ferr(el_option(EL_FNAME, "/tmp/embedlog-no-write/log"), EACCES);
         mt_ferr(el_puts("whatever"), EBADF);
     }
     unlink("/tmp/embedlog-no-write/log");
@@ -912,8 +912,8 @@ static void file_no_access_to_file(void)
 
 static void file_rotate_no_dir_for_logs(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
-    mt_ferr(el_option(EL_OPT_FNAME, "/tmp/i-dont/exist"), ENOENT);
+    el_option(EL_FROTATE_NUMBER, 5);
+    mt_ferr(el_option(EL_FNAME, "/tmp/i-dont/exist"), ENOENT);
     mt_ferr(el_puts("whatever"), EBADF);
 }
 
@@ -924,7 +924,7 @@ static void file_rotate_no_dir_for_logs(void)
 
 static void file_rotate_dir_removed_after_open_then_created_back_again(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
+    el_option(EL_FROTATE_NUMBER, 5);
     mt_fok(el_puts(s8));
     mt_fok(el_puts(s8));
     mt_fok(el_puts(s8));
@@ -972,18 +972,18 @@ static void file_rotate_dir_removed_after_open_then_created_back_again(void)
 
 static void file_rotate_dir_no_access(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
+    el_option(EL_FROTATE_NUMBER, 5);
     mkdir("/tmp/embedlog-no-write", 0555);
 
     if (getuid() == 0)
     {
-        mt_fok(el_option(EL_OPT_FNAME, "/tmp/embedlog-no-write/log"));
+        mt_fok(el_option(EL_FNAME, "/tmp/embedlog-no-write/log"));
         mt_fok(el_puts(s3));
         mt_fok(file_check("/tmp/embedlog-no-write/log.0", s3));
     }
     else
     {
-        mt_ferr(el_option(EL_OPT_FNAME, "/tmp/embedlog-no-write/log"), EACCES);
+        mt_ferr(el_option(EL_FNAME, "/tmp/embedlog-no-write/log"), EACCES);
         mt_ferr(el_puts(s3), EBADF);
     }
 
@@ -1002,20 +1002,20 @@ static void file_rotate_no_access_to_file(void)
     /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
+    el_option(EL_FROTATE_NUMBER, 5);
     mkdir("/tmp/embedlog-no-write", 0755);
     fd = open("/tmp/embedlog-no-write/log.0", O_CREAT, 0444);
     close(fd);
 
     if (getuid() == 0)
     {
-        mt_fok(el_option(EL_OPT_FNAME, "/tmp/embedlog-no-write/log"));
+        mt_fok(el_option(EL_FNAME, "/tmp/embedlog-no-write/log"));
         mt_fok(el_puts(s8));
         mt_fok(file_check("/tmp/embedlog-no-write/log.0", s8));
     }
     else
     {
-        mt_ferr(el_option(EL_OPT_FNAME, "/tmp/embedlog-no-write/log"), EACCES);
+        mt_ferr(el_option(EL_FNAME, "/tmp/embedlog-no-write/log"), EACCES);
         mt_ferr(el_puts("whatever"), EBADF);
     }
 
@@ -1036,8 +1036,8 @@ static void file_rotate_filename_too_long(void)
 
     memset(path, 'a', sizeof(path));
     path[sizeof(path) - 1] = '\0';
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
-    mt_ferr(el_option(EL_OPT_FNAME, path), ENAMETOOLONG);
+    el_option(EL_FROTATE_NUMBER, 5);
+    mt_ferr(el_option(EL_FNAME, path), ENAMETOOLONG);
 }
 
 
@@ -1059,8 +1059,8 @@ static void file_rotate_path_too_long(void)
     path[sizeof(path) - 3] = 'l';
     path[sizeof(path) - 2] = 'e';
     path[sizeof(path) - 1] = '\0';
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
-    mt_ferr(el_option(EL_OPT_FNAME, path), ENAMETOOLONG);
+    el_option(EL_FROTATE_NUMBER, 5);
+    mt_ferr(el_option(EL_FNAME, path), ENAMETOOLONG);
 }
 
 
@@ -1070,7 +1070,7 @@ static void file_rotate_path_too_long(void)
 
 static void file_rotate_fail(void)
 {
-    el_option(EL_OPT_FROTATE_NUMBER, 5);
+    el_option(EL_FROTATE_NUMBER, 5);
     mt_fok(el_puts(s8));
     mt_fok(el_puts(s8));
     unlink(WORKDIR"/log");
diff --git a/tst/el-options.c b/tst/el-options.c
index 97212e8..1e6fa85 100644
--- a/tst/el-options.c
+++ b/tst/el-options.c
@@ -96,8 +96,8 @@ static void options_init(void)
     default_options.outputs         = 0;
     default_options.level           = EL_INFO;
     default_options.colors          = 0;
-    default_options.timestamp       = EL_OPT_TS_OFF;
-    default_options.timestamp_timer = EL_OPT_TS_TM_CLOCK;
+    default_options.timestamp       = EL_TS_OFF;
+    default_options.timestamp_timer = EL_TS_TM_CLOCK;
     default_options.print_log_level = 1;
     default_options.custom_puts     = NULL;
 
@@ -143,7 +143,7 @@ static void options_level_set(void)
 
     for (i = 0; i != 32; ++i)
     {
-        mt_fail(el_option(EL_OPT_LEVEL, i) == 0);
+        mt_fail(el_option(EL_LEVEL, i) == 0);
         mt_fail(g_options.level == i);
     }
 }
@@ -159,14 +159,14 @@ static void options_output(void)
     /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
     current_outputs = 0;
-    mt_fok(el_option(EL_OPT_OUT, EL_OPT_OUT_STDERR));
-    mt_fail(g_options.outputs == EL_OPT_OUT_STDERR);
+    mt_fok(el_option(EL_OUT, EL_OUT_STDERR));
+    mt_fail(g_options.outputs == EL_OUT_STDERR);
 
-    mt_fok(el_option(EL_OPT_OUT, (EL_OPT_OUT_STDERR | EL_OPT_OUT_FILE)));
-    mt_fail(g_options.outputs == (EL_OPT_OUT_STDERR | EL_OPT_OUT_FILE));
+    mt_fok(el_option(EL_OUT, (EL_OUT_STDERR | EL_OUT_FILE)));
+    mt_fail(g_options.outputs == (EL_OUT_STDERR | EL_OUT_FILE));
 
-    mt_ferr(el_option(EL_OPT_OUT, EL_OPT_OUT_ALL + 7), EINVAL);
-    mt_fail(g_options.outputs == (EL_OPT_OUT_STDERR | EL_OPT_OUT_FILE));
+    mt_ferr(el_option(EL_OUT, EL_OUT_ALL + 7), EINVAL);
+    mt_fail(g_options.outputs == (EL_OUT_STDERR | EL_OUT_FILE));
 }
 
 
@@ -177,7 +177,7 @@ static void options_output(void)
 static void options_log_allowed(void)
 {
     g_options.level = EL_ERROR;
-    g_options.outputs = EL_OPT_OUT_STDERR;
+    g_options.outputs = EL_OUT_STDERR;
 
     mt_fail(el_log_allowed(&g_options, EL_FATAL)  == 1);
     mt_fail(el_log_allowed(&g_options, EL_ALERT)  == 1);
@@ -196,16 +196,16 @@ static void options_log_allowed(void)
 
 static void options_opt_print_level(void)
 {
-    mt_fail(el_option(EL_OPT_PRINT_LEVEL, 0) == 0);
+    mt_fail(el_option(EL_PRINT_LEVEL, 0) == 0);
     mt_fail(g_options.print_log_level == 0);
-    mt_fail(el_option(EL_OPT_PRINT_LEVEL, 1) == 0);
+    mt_fail(el_option(EL_PRINT_LEVEL, 1) == 0);
     mt_fail(g_options.print_log_level == 1);
 
     errno = 0;
-    mt_fail(el_option(EL_OPT_PRINT_LEVEL, 2) == -1);
+    mt_fail(el_option(EL_PRINT_LEVEL, 2) == -1);
     mt_fail(errno == EINVAL);
     errno = 0;
-    mt_fail(el_option(EL_OPT_PRINT_LEVEL, 3) == -1);
+    mt_fail(el_option(EL_PRINT_LEVEL, 3) == -1);
     mt_fail(errno == EINVAL);
 }
 
@@ -216,13 +216,13 @@ static void options_opt_print_level(void)
 
 static void options_opt_colors(void)
 {
-    mt_fok(el_option(EL_OPT_COLORS, 0));
+    mt_fok(el_option(EL_COLORS, 0));
     mt_fail(g_options.colors == 0);
-    mt_fok(el_option(EL_OPT_COLORS, 1));
+    mt_fok(el_option(EL_COLORS, 1));
     mt_fail(g_options.colors == 1);
 
-    mt_ferr(el_option(EL_OPT_COLORS, 2), EINVAL);
-    mt_ferr(el_option(EL_OPT_COLORS, 3), EINVAL);
+    mt_ferr(el_option(EL_COLORS, 2), EINVAL);
+    mt_ferr(el_option(EL_COLORS, 3), EINVAL);
 }
 
 
@@ -236,13 +236,13 @@ static void options_opt_timestamp(void)
     /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 
-    for (i = EL_OPT_TS_OFF; i != EL_OPT_TS_ERROR; ++i)
+    for (i = EL_TS_OFF; i != EL_TS_ERROR; ++i)
     {
-        mt_fok(el_option(EL_OPT_TS, i));
+        mt_fok(el_option(EL_TS, i));
         mt_fail(g_options.timestamp == i);
     }
 
-    mt_ferr(el_option(EL_OPT_TS, i), EINVAL);
+    mt_ferr(el_option(EL_TS, i), EINVAL);
 }
 
 
@@ -256,13 +256,13 @@ static void options_opt_timestamp_timer(void)
     /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 
-    for (i = EL_OPT_TS_TM_CLOCK; i != EL_OPT_TS_TM_ERROR; ++i)
+    for (i = EL_TS_TM_CLOCK; i != EL_TS_TM_ERROR; ++i)
     {
-        mt_fok(el_option(EL_OPT_TS_TM, i));
+        mt_fok(el_option(EL_TS_TM, i));
         mt_fail(g_options.timestamp_timer == i);
     }
 
-    mt_ferr(el_option(EL_OPT_TS_TM, i), EINVAL);
+    mt_ferr(el_option(EL_TS_TM, i), EINVAL);
 }
 
 
@@ -276,8 +276,8 @@ static void options_ooption_test(void)
     /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 
-    el_ooption(&opts, EL_OPT_TS_TM, EL_OPT_TS_TM_MONOTONIC);
-    mt_fail(opts.timestamp_timer == EL_OPT_TS_TM_MONOTONIC);
+    el_ooption(&opts, EL_TS_TM, EL_TS_TM_MONOTONIC);
+    mt_fail(opts.timestamp_timer == EL_TS_TM_MONOTONIC);
 }
 
 
diff --git a/tst/el-perror.c b/tst/el-perror.c
index 0fb1944..0a9014f 100644
--- a/tst/el-perror.c
+++ b/tst/el-perror.c
@@ -81,9 +81,9 @@ static int print_to_buffer
 static void test_prepare(void)
 {
     el_init();
-    el_option(EL_OPT_CUSTOM_PUTS, print_to_buffer);
-    el_option(EL_OPT_PRINT_LEVEL, 0);
-    el_option(EL_OPT_OUT, EL_OPT_OUT_CUSTOM);
+    el_option(EL_CUSTOM_PUTS, print_to_buffer);
+    el_option(EL_PRINT_LEVEL, 0);
+    el_option(EL_OUT, EL_OUT_CUSTOM);
     logbuf[0] = '\0';
 }
 
@@ -140,9 +140,9 @@ static void perror_custom_options_user_message(void)
 
 
     el_oinit(&opts);
-    el_ooption(&opts, EL_OPT_CUSTOM_PUTS, print_to_buffer);
-    el_ooption(&opts, EL_OPT_PRINT_LEVEL, 0);
-    el_ooption(&opts, EL_OPT_OUT, EL_OPT_OUT_CUSTOM);
+    el_ooption(&opts, EL_CUSTOM_PUTS, print_to_buffer);
+    el_ooption(&opts, EL_PRINT_LEVEL, 0);
+    el_ooption(&opts, EL_OUT, EL_OUT_CUSTOM);
 
     errno = 1;
     el_operror(ELF, &opts, "additional message");
diff --git a/tst/el-pmemory.c b/tst/el-pmemory.c
index 0c7fed7..da1c17e 100644
--- a/tst/el-pmemory.c
+++ b/tst/el-pmemory.c
@@ -81,9 +81,9 @@ static int print_to_buffer
 static void test_prepare(void)
 {
     el_init();
-    el_option(EL_OPT_CUSTOM_PUTS, print_to_buffer);
-    el_option(EL_OPT_PRINT_LEVEL, 0);
-    el_option(EL_OPT_OUT, EL_OPT_OUT_CUSTOM);
+    el_option(EL_CUSTOM_PUTS, print_to_buffer);
+    el_option(EL_PRINT_LEVEL, 0);
+    el_option(EL_OUT, EL_OUT_CUSTOM);
     logbuf[0] = '\0';
 }
 
diff --git a/tst/el-print.c b/tst/el-print.c
index 52db5ed..8bbe9d6 100644
--- a/tst/el-print.c
+++ b/tst/el-print.c
@@ -173,7 +173,7 @@ static int print_check(void)
          * check printing timestamp
          */
 
-        if (g_options.timestamp == EL_OPT_TS_LONG)
+        if (g_options.timestamp == EL_TS_LONG)
         {
             IS_CHAR('[');
             IS_DIGIT();
@@ -204,7 +204,7 @@ static int print_check(void)
             IS_CHAR(']');
 
         }
-        else if (g_options.timestamp == EL_OPT_TS_SHORT)
+        else if (g_options.timestamp == EL_TS_SHORT)
         {
             IS_CHAR('[');
             while (*msg != '.' )
@@ -220,7 +220,7 @@ static int print_check(void)
             }
             IS_CHAR(']');
         }
-        else if (g_options.timestamp == EL_OPT_TS_OFF)
+        else if (g_options.timestamp == EL_TS_OFF)
         {
             /*
              * we check for nothing here
@@ -311,7 +311,7 @@ static int print_check(void)
         }
 
         if ((g_options.finfo && expected.file != NULL && expected.line != 0) ||
-             g_options.timestamp != EL_OPT_TS_OFF)
+             g_options.timestamp != EL_TS_OFF)
         {
             /*
              * file info or timestamp information is enabled, in that case
@@ -427,9 +427,9 @@ static void add_log
 static void test_prepare(void)
 {
     el_init();
-    el_option(EL_OPT_CUSTOM_PUTS, print_to_buffer);
-    el_option(EL_OPT_PRINT_LEVEL, 0);
-    el_option(EL_OPT_OUT, EL_OPT_OUT_CUSTOM);
+    el_option(EL_CUSTOM_PUTS, print_to_buffer);
+    el_option(EL_PRINT_LEVEL, 0);
+    el_option(EL_OUT, EL_OUT_CUSTOM);
     memset(logbuf, 0, sizeof(logbuf));
     expected_logs = rb_new(1024, sizeof(struct log_message),
         O_NONTHREAD | O_NONBLOCK);
@@ -484,8 +484,8 @@ static void print_simple_multiple_message(void)
 
 static void print_log_level(void)
 {
-    el_option(EL_OPT_PRINT_LEVEL, 1);
-    el_option(EL_OPT_LEVEL, EL_DBG);
+    el_option(EL_PRINT_LEVEL, 1);
+    el_option(EL_LEVEL, EL_DBG);
     add_log(ELF, "print_log_level fatal message");
     add_log(ELA, "print_log_level alert message");
     add_log(ELC, "print_log_level critical message");
@@ -504,8 +504,8 @@ static void print_log_level(void)
 
 static void print_colorful_output(void)
 {
-    el_option(EL_OPT_COLORS, 1);
-    el_option(EL_OPT_LEVEL, EL_DBG + 2);
+    el_option(EL_COLORS, 1);
+    el_option(EL_LEVEL, EL_DBG + 2);
     add_log(ELF, "print_colorful_output fatal message");
     add_log(ELA, "print_colorful_output alert message");
     add_log(ELC, "print_colorful_output critical message");
@@ -526,8 +526,8 @@ static void print_colorful_output(void)
 
 static void print_custom_log_level(void)
 {
-    el_option(EL_OPT_PRINT_LEVEL, 1);
-    el_option(EL_OPT_LEVEL, EL_DBG + 5);
+    el_option(EL_PRINT_LEVEL, 1);
+    el_option(EL_LEVEL, EL_DBG + 5);
     add_log(ELD + 4, "print_custom_log_level custom debug 4");
     add_log(ELD + 5, "print_custom_log_level custom debug 5");
     add_log(ELD + 6, "print_custom_log_level custom debug 6");
@@ -541,7 +541,7 @@ static void print_custom_log_level(void)
 
 static void print_timestamp_short(void)
 {
-    el_option(EL_OPT_TS, EL_OPT_TS_SHORT);
+    el_option(EL_TS, EL_TS_SHORT);
     add_log(ELF, "print_timestamp_short first");
     add_log(ELF, "print_timestamp_short second");
     mt_fok(print_check());
@@ -554,7 +554,7 @@ static void print_timestamp_short(void)
 
 static void print_timestamp_long(void)
 {
-    el_option(EL_OPT_TS, EL_OPT_TS_LONG);
+    el_option(EL_TS, EL_TS_LONG);
     add_log(ELF, "print_timestamp_long first");
     add_log(ELF, "print_timestamp_long second");
     mt_fok(print_check());
@@ -567,7 +567,7 @@ static void print_timestamp_long(void)
 
 static void print_finfo(void)
 {
-    el_option(EL_OPT_FINFO, 1);
+    el_option(EL_FINFO, 1);
     add_log(ELF, "print_finfo first");
     add_log(ELF, "print_finfo second");
     mt_fok(print_check());
@@ -584,11 +584,11 @@ static void print_different_clocks(void)
     /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 
-    for (i = EL_OPT_TS_TM_CLOCK; i != EL_OPT_TS_TM_ERROR; ++i)
+    for (i = EL_TS_TM_CLOCK; i != EL_TS_TM_ERROR; ++i)
     {
         test_prepare();
-        el_option(EL_OPT_TS_TM, i);
-        el_option(EL_OPT_TS, EL_OPT_TS_LONG);
+        el_option(EL_TS_TM, i);
+        el_option(EL_TS, EL_TS_LONG);
         add_log(ELI, "clock test");
         mt_fok(print_check());
         test_cleanup();
@@ -611,17 +611,17 @@ static void print_mix_of_everything(void)
 
 
     for (level = EL_FATAL;          level <= EL_DBG;              ++level)
-    for (timestamp = EL_OPT_TS_OFF; timestamp != EL_OPT_TS_ERROR; ++timestamp)
+    for (timestamp = EL_TS_OFF; timestamp != EL_TS_ERROR; ++timestamp)
     for (printlevel = 0;            printlevel <= 1;              ++printlevel)
     for (finfo = 0;                 finfo <= 1;                   ++finfo)
     for (colors = 0;                colors <= 1;                  ++colors)
     {
         test_prepare();
-        el_option(EL_OPT_LEVEL, level);
-        el_option(EL_OPT_TS, timestamp);
-        el_option(EL_OPT_PRINT_LEVEL, printlevel);
-        el_option(EL_OPT_FINFO, finfo);
-        el_option(EL_OPT_COLORS, colors);
+        el_option(EL_LEVEL, level);
+        el_option(EL_TS, timestamp);
+        el_option(EL_PRINT_LEVEL, printlevel);
+        el_option(EL_FINFO, finfo);
+        el_option(EL_COLORS, colors);
 
         add_log(ELF, "fatal message");
         add_log(ELA, "alert message");
@@ -681,7 +681,7 @@ static void print_truncate_with_date(void)
     /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 
-    el_option(EL_OPT_TS, EL_OPT_TS_LONG);
+    el_option(EL_TS, EL_TS_LONG);
     memset(msg, 'a', sizeof(msg));
     msg[sizeof(msg) - 1] = '\0';
     msg[sizeof(msg) - 2] = '3';
@@ -708,9 +708,9 @@ static void print_truncate_with_all_options(void)
     /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 
-    el_option(EL_OPT_TS, EL_OPT_TS_LONG);
-    el_option(EL_OPT_FINFO, 1);
-    el_option(EL_OPT_PRINT_LEVEL, 1);
+    el_option(EL_TS, EL_TS_LONG);
+    el_option(EL_FINFO, 1);
+    el_option(EL_PRINT_LEVEL, 1);
     memset(msg, 'a', sizeof(msg));
     msg[sizeof(msg) - 1] = '\0';
     msg[sizeof(msg) - 2] = '3';
@@ -733,7 +733,7 @@ static void print_truncate_with_all_options(void)
 
 static void print_with_no_output_available(void)
 {
-    el_option(EL_OPT_OUT, EL_OPT_OUT_NONE);
+    el_option(EL_OUT, EL_OUT_NONE);
     mt_ferr(el_print(ELI, "i'll be back"), ENODEV);
 }
 
@@ -754,7 +754,7 @@ static void print_level_not_high_enough(void)
 
 static void print_finfo_path(void)
 {
-    el_option(EL_OPT_FINFO, 1);
+    el_option(EL_FINFO, 1);
     add_log("source/code/file.c", 10, EL_ALERT, "some message");
     mt_fok(print_check());
 }
@@ -766,7 +766,7 @@ static void print_finfo_path(void)
 
 static void print_nofinfo(void)
 {
-    el_option(EL_OPT_FINFO, 1);
+    el_option(EL_FINFO, 1);
     add_log(NULL, 0, EL_ALERT, "no file info");
     mt_fok(print_check());
 }