diff options
| author | Allen Winter <allen.winter@kdab.com> | 2015-04-18 17:07:04 -0400 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2015-04-18 17:07:04 -0400 |
| commit | 043df63a39bffdf0b18f7bb5b864f1a73a4c9033 (patch) | |
| tree | 91093cd4fdc34747420d5582bfe4e35714830bd4 /src | |
| parent | e991a0af2445fad66659000f54baf67d82f6d046 (diff) | |
| download | libical-git-043df63a39bffdf0b18f7bb5b864f1a73a4c9033.tar.gz | |
vcc.c - fix check for non-zero pointer before calling stricmp
also fix a print format for an unsigned long
Diffstat (limited to 'src')
| -rw-r--r-- | src/libicalvcal/vcc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libicalvcal/vcc.c b/src/libicalvcal/vcc.c index 63e6c1d9..00076345 100644 --- a/src/libicalvcal/vcc.c +++ b/src/libicalvcal/vcc.c @@ -521,10 +521,10 @@ static void enterAttr(const char *s1, const char *s2) } else addProp(curProp,p1); - if (stricmp(p1,VCBase64Prop) == 0 || (s2 && stricmp(p2,VCBase64Prop)==0)) + if (stricmp(p1,VCBase64Prop) == 0 || (p2 && stricmp(p2,VCBase64Prop)==0)) lexPushMode(L_BASE64); else if (stricmp(p1,VCQuotedPrintableProp) == 0 - || (s2 && stricmp(p2,VCQuotedPrintableProp)==0)) + || (p2 && stricmp(p2,VCQuotedPrintableProp)==0)) lexPushMode(L_QUOTED_PRINTABLE); deleteStr(s1); deleteStr(s2); } @@ -954,7 +954,7 @@ static char * lexGetDataFromBase64() } } } /* while */ - DBG_(("db: bytesLen = %d\n", bytesLen)); + DBG_(("db: bytesLen = %lu\n", bytesLen)); /* kludge: all this won't be necessary if we have tree form representation */ if (bytes) { |