diff options
author | Milan Crha <mcrha@redhat.com> | 2022-10-26 17:45:42 +0200 |
---|---|---|
committer | Allen Winter <allen.winter@kdab.com> | 2022-11-13 12:31:06 -0500 |
commit | 7d701ff5ba1425895ac138be6ec0a177ec26c1ce (patch) | |
tree | 74e75f28b00fe2ea2c430672ff6ea68ed8b8793d /src/libicalvcal | |
parent | f9b2c34a551d461d065bf868e218f3df560be93f (diff) | |
download | libical-git-7d701ff5ba1425895ac138be6ec0a177ec26c1ce.tar.gz |
misc: Update sources to more modern C
The code fails to build when having enabled (gcc) warnings:
-Werror=implicit
-Werror=implicit-function-declaration
-Werror=implicit-int
-Werror=int-conversion
-Werror=old-style-definition
-Werror=strict-prototypes
Diffstat (limited to 'src/libicalvcal')
-rw-r--r-- | src/libicalvcal/vcc.c | 36 | ||||
-rw-r--r-- | src/libicalvcal/vobject.c | 2 | ||||
-rw-r--r-- | src/libicalvcal/vobject.h | 2 |
3 files changed, 20 insertions, 20 deletions
diff --git a/src/libicalvcal/vcc.c b/src/libicalvcal/vcc.c index 19eb9a16..97632198 100644 --- a/src/libicalvcal/vcc.c +++ b/src/libicalvcal/vcc.c @@ -444,7 +444,7 @@ static int pushVObject(const char *prop) /* This pops the recently built vCard off the stack and returns it. */ -static VObject* popVObject() +static VObject* popVObject(void) { VObject *oldObj; if (ObjStackTop < 0) { @@ -577,7 +577,7 @@ static int lexWithinMode(enum LexMode mode) { return 0; } -static char lexGetc_() +static char lexGetc_(void) { /* get next char from input, no buffering. */ if (lexBuf.curPos == lexBuf.inputLen) @@ -594,7 +594,7 @@ static char lexGetc_() } } -static int lexGeta() +static int lexGeta(void) { ++lexBuf.len; return (lexBuf.buf[lexBuf.getPtr] = lexGetc_()); @@ -606,7 +606,7 @@ static int lexGeta_(int i) return (lexBuf.buf[(lexBuf.getPtr+i)%MAX_LEX_LOOKAHEAD] = lexGetc_()); } -static void lexSkipLookahead() { +static void lexSkipLookahead(void) { if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=((char) EOF)) { /* don't skip EOF. */ lexBuf.getPtr = (lexBuf.getPtr + 1) % MAX_LEX_LOOKAHEAD; @@ -614,7 +614,7 @@ static void lexSkipLookahead() { } } -static int lexLookahead() { +static int lexLookahead(void) { int c = (lexBuf.len)? lexBuf.buf[lexBuf.getPtr]: lexGeta(); @@ -640,7 +640,7 @@ static int lexLookahead() { return c; } -static int lexGetc() { +static int lexGetc(void) { int c = lexLookahead(); if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=((char) EOF)) { /* EOF will remain in lookahead buffer */ @@ -650,14 +650,14 @@ static int lexGetc() { return c; } -static void lexSkipLookaheadWord() { +static void lexSkipLookaheadWord(void) { if (lexBuf.strsLen <= lexBuf.len) { lexBuf.len -= lexBuf.strsLen; lexBuf.getPtr = (lexBuf.getPtr + lexBuf.strsLen) % MAX_LEX_LOOKAHEAD; } } -static void lexClearToken() +static void lexClearToken(void) { lexBuf.strsLen = 0; } @@ -675,11 +675,11 @@ static void lexAppendc(int c) } } -static char* lexStr() { +static char* lexStr(void) { return dupStr(lexBuf.strs,(size_t)lexBuf.strsLen+1); } -static void lexSkipWhite() { +static void lexSkipWhite(void) { int c = lexLookahead(); while (c == ' ' || c == '\t') { lexSkipLookahead(); @@ -687,7 +687,7 @@ static void lexSkipWhite() { } } -static char* lexGetWord() { +static char* lexGetWord(void) { int c; lexSkipWhite(); lexClearToken(); @@ -712,7 +712,7 @@ static void lexPushLookaheadc(int c) { lexBuf.len += 1; } -static char* lexLookaheadWord() { +static char* lexLookaheadWord(void) { /* this function can lookahead word with max size of MAX_LEX_LOOKAHEAD_0 / and thing bigger than that will stop the lookahead and return 0; / leading white spaces are not recoverable. @@ -778,7 +778,7 @@ static void handleMoreRFC822LineBreak(int c) { } } -static char* lexGet1Value() { +static char* lexGet1Value(void) { int c; lexSkipWhite(); c = lexLookahead(); @@ -849,7 +849,7 @@ void initLex(const char *inputstring, unsigned long inputlen, FILE *inputfile) } -static void finiLex() { +static void finiLex(void) { VObject* vobj, *topobj = 0; while(vobj = popVObject(), vobj) { topobj = vobj; @@ -863,7 +863,7 @@ static void finiLex() { /* This parses and converts the base64 format for binary encoding into * a decoded buffer (allocated with new). See RFC 1521. */ -static char * lexGetDataFromBase64() +static char * lexGetDataFromBase64(void) { size_t bytesLen = 0, bytesMax = 0; int quadIx = 0, pad = 0; @@ -985,7 +985,7 @@ static int match_begin_end_name(int end) { return 0; } -static char* lexGetQuotedPrintable() +static char* lexGetQuotedPrintable(void) { char cur; @@ -1042,7 +1042,7 @@ EndString: return lexStr(); } /* LexQuotedPrintable */ -int yylex() { +int yylex(void) { int lexmode = LEXMODE(); if (lexmode == L_VALUES) { @@ -1160,7 +1160,7 @@ int yylex() { /*** Public Functions ****/ /***************************************************************************/ -static VObject* Parse_MIMEHelper() +static VObject* Parse_MIMEHelper(void) { ObjStackTop = -1; mime_numErrors = 0; diff --git a/src/libicalvcal/vobject.c b/src/libicalvcal/vobject.c index 10d0cf5a..03a4249c 100644 --- a/src/libicalvcal/vobject.c +++ b/src/libicalvcal/vobject.c @@ -682,7 +682,7 @@ void unUseStr(const char *s) } } -void cleanStrTbl() +void cleanStrTbl(void) { int i; for (i=0; i<STRTBLSIZE;i++) { diff --git a/src/libicalvcal/vobject.h b/src/libicalvcal/vobject.h index 7541be58..ca3317ca 100644 --- a/src/libicalvcal/vobject.h +++ b/src/libicalvcal/vobject.h @@ -297,7 +297,7 @@ extern "C" LIBICAL_VCAL_EXPORT char *writeMemVObjects(char *s, int *len, VObject *list); LIBICAL_VCAL_EXPORT const char *lookupStr(const char *s); - LIBICAL_VCAL_EXPORT void cleanStrTbl(); + LIBICAL_VCAL_EXPORT void cleanStrTbl(void); LIBICAL_VCAL_EXPORT void cleanVObject(VObject *o); LIBICAL_VCAL_EXPORT void cleanVObjects(VObject *list); |