From 208bf7df54846dc1050cabd3b5574fb6d8d95fa2 Mon Sep 17 00:00:00 2001
From: Florian Prill <florian.prill@dwd.de>
Date: Tue, 16 Jun 2020 13:19:06 +0200
Subject: [PATCH] [event_generic_review] removed obsolete constant; renamed
another one.
---
include/mtime_eventBasic.h | 4 +---
src/mtime_eventBasic.c | 10 +++++-----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/include/mtime_eventBasic.h b/include/mtime_eventBasic.h
index db47bb39..8c2506eb 100644
--- a/include/mtime_eventBasic.h
+++ b/include/mtime_eventBasic.h
@@ -23,10 +23,8 @@
#include "mtime_julianDay.h"
-///provides a Maximum string length for Group Names.
-#define MAX_GROUPNAME_STR_LEN 132
///provides a Maximum string length for Event names.
-#define MAX_EVENTNAME_STR_LEN 132
+#define MAX_BASICEVENTNAME_STR_LEN 132
struct _datetime;
struct t_event_basic_cache;
diff --git a/src/mtime_eventBasic.c b/src/mtime_eventBasic.c
index 48e35225..802732e4 100644
--- a/src/mtime_eventBasic.c
+++ b/src/mtime_eventBasic.c
@@ -254,11 +254,11 @@ newBasicEventWithDataType(const char* _en,
int ret = 0;
/* Copy event name. */
- e->eventName = (char*)calloc(MAX_EVENTNAME_STR_LEN,sizeof(char));
+ e->eventName = (char*)calloc(MAX_BASICEVENTNAME_STR_LEN,sizeof(char));
if (e->eventName == NULL ) goto cleanup_and_exit;
- strncpy(e->eventName, _en, MAX_EVENTNAME_STR_LEN-1);
- e->eventName[MAX_EVENTNAME_STR_LEN - 1] = '\0';
+ strncpy(e->eventName, _en, MAX_BASICEVENTNAME_STR_LEN-1);
+ e->eventName[MAX_BASICEVENTNAME_STR_LEN - 1] = '\0';
/* Start Date. Default start date = "0-01-01T00:00:00.000". */
if (eventFirstDT)
@@ -525,8 +525,8 @@ getBasicEventName(struct t_event_basic* e, char* ename)
{
if ((e != NULL) && (ename != NULL))
{
- strncpy(ename, e->eventName, MAX_EVENTNAME_STR_LEN-1);
- ename[MAX_EVENTNAME_STR_LEN-1] = '\0';
+ strncpy(ename, e->eventName, MAX_BASICEVENTNAME_STR_LEN-1);
+ ename[MAX_BASICEVENTNAME_STR_LEN-1] = '\0';
return ename;
}
else
--
GitLab