#971 add str_toupper()

Add new utils.c file and replace old StrToUpper().
master
OpenGnSys Support Team 2020-06-08 18:26:24 +02:00
parent d8f2e6ba20
commit f4e7832656
4 changed files with 31 additions and 9 deletions

View File

@ -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

View File

@ -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);

14
sources/utils.c 100644
View File

@ -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;
}

6
sources/utils.h 100644
View File

@ -0,0 +1,6 @@
#ifndef _OG_UTILS_H
#define _OG_UTILS_H
const char *str_toupper(char *str);
#endif