Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

coverity warning: NEGATIVE_RETURNS

This commit is contained in:
Enno Rehling 2016-11-14 02:21:49 +01:00
parent 03a94d1264
commit 5e48eac26a
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kernel/types.h
View File

@ -144,7 +144,7 @@ typedef enum {
P_TREES, P_TREES,
P_ALLIANCE, P_ALLIANCE,
MAXPARAMS, MAXPARAMS,
NOPARAM = -1 NOPARAM
} param_t; } param_t;
typedef enum { /* Fehler und Meldungen im Report */ typedef enum { /* Fehler und Meldungen im Report */

3
src/keyword.c
View File

@ -14,6 +14,9 @@
const char * keyword(keyword_t kwd) const char * keyword(keyword_t kwd)
{ {
static char result[32]; // FIXME: static return value static char result[32]; // FIXME: static return value
if (kwd==NOKEYWORD) {
return NULL;
}
if (!result[0]) { if (!result[0]) {
strcpy(result, "keyword::"); strcpy(result, "keyword::");
} }

2
src/keyword.h
View File

@ -70,7 +70,7 @@ extern "C"
K_PAY, K_PAY,
K_LOOT, K_LOOT,
MAXKEYWORDS, MAXKEYWORDS,
NOKEYWORD = -1 NOKEYWORD
} keyword_t; } keyword_t;
extern const char *keywords[MAXKEYWORDS]; extern const char *keywords[MAXKEYWORDS];

4
src/keyword.test.c
View File

@ -11,11 +11,13 @@
static void test_init_keywords(CuTest *tc) { static void test_init_keywords(CuTest *tc) {
struct locale *lang; struct locale *lang;
test_cleanup(); test_setup();
lang = get_or_create_locale("en"); lang = get_or_create_locale("en");
locale_setstring(lang, "keyword::move", "MOVE"); locale_setstring(lang, "keyword::move", "MOVE");
init_keywords(lang); init_keywords(lang);
CuAssertIntEquals(tc, K_MOVE, get_keyword("move", lang)); CuAssertIntEquals(tc, K_MOVE, get_keyword("move", lang));
CuAssertStrEquals(tc, "keyword::move", keyword(K_MOVE));
CuAssertPtrEquals(tc, NULL, (void *)keyword(NOKEYWORD));
test_cleanup(); test_cleanup();
} }