summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--sources/ogAdmServer.c17
-rw-r--r--sources/utils.c14
-rw-r--r--sources/utils.h6
4 files changed, 31 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 433cfd1..6904c09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,4 +4,5 @@ AM_CFLAGS = -I../../Includes ${LIBDBI_CFLAGS} ${LIBJANSSON_CFLAGS} ${LIBEVENT_C
ogAdmServer_SOURCES= sources/ogAdmServer.c \
sources/dbi.c \
- sources/schedule.c
+ sources/schedule.c \
+ sources/utils.c
diff --git a/sources/ogAdmServer.c b/sources/ogAdmServer.c
index 422947d..f4b287e 100644
--- a/sources/ogAdmServer.c
+++ b/sources/ogAdmServer.c
@@ -9,6 +9,7 @@
#include "ogAdmServer.h"
#include "ogAdmLib.c"
#include "dbi.h"
+#include "utils.h"
#include "list.h"
#include "schedule.h"
#include <ev.h>
@@ -75,21 +76,21 @@ static bool tomaConfiguracion(const char *filecfg)
key = strtok(line, delim);
value = strtok(NULL, delim);
- if (!strcmp(StrToUpper(key), "SERVIDORADM"))
+ if (!strcmp(str_toupper(key), "SERVIDORADM"))
snprintf(servidoradm, sizeof(servidoradm), "%s", value);
- else if (!strcmp(StrToUpper(key), "PUERTO"))
+ else if (!strcmp(str_toupper(key), "PUERTO"))
snprintf(puerto, sizeof(puerto), "%s", value);
- else if (!strcmp(StrToUpper(key), "USUARIO"))
+ else if (!strcmp(str_toupper(key), "USUARIO"))
snprintf(usuario, sizeof(usuario), "%s", value);
- else if (!strcmp(StrToUpper(key), "PASSWORD"))
+ else if (!strcmp(str_toupper(key), "PASSWORD"))
snprintf(pasguor, sizeof(pasguor), "%s", value);
- else if (!strcmp(StrToUpper(key), "DATASOURCE"))
+ else if (!strcmp(str_toupper(key), "DATASOURCE"))
snprintf(datasource, sizeof(datasource), "%s", value);
- else if (!strcmp(StrToUpper(key), "CATALOG"))
+ else if (!strcmp(str_toupper(key), "CATALOG"))
snprintf(catalog, sizeof(catalog), "%s", value);
- else if (!strcmp(StrToUpper(key), "INTERFACE"))
+ else if (!strcmp(str_toupper(key), "INTERFACE"))
snprintf(interface, sizeof(interface), "%s", value);
- else if (!strcmp(StrToUpper(key), "APITOKEN"))
+ else if (!strcmp(str_toupper(key), "APITOKEN"))
snprintf(auth_token, sizeof(auth_token), "%s", value);
line = fgets(buf, sizeof(buf), fcfg);
diff --git a/sources/utils.c b/sources/utils.c
new file mode 100644
index 0000000..4aa76f8
--- /dev/null
+++ b/sources/utils.c
@@ -0,0 +1,14 @@
+#include <ctype.h>
+#include "utils.h"
+
+const char *str_toupper(char *str)
+{
+ char *c = str;
+
+ while (*c) {
+ *c = toupper(*c);
+ c++;
+ }
+
+ return str;
+}
diff --git a/sources/utils.h b/sources/utils.h
new file mode 100644
index 0000000..e32d006
--- /dev/null
+++ b/sources/utils.h
@@ -0,0 +1,6 @@
+#ifndef _OG_UTILS_H
+#define _OG_UTILS_H
+
+const char *str_toupper(char *str);
+
+#endif