Mercurial > hg > freeDiameter
diff libfdproto/ostr.c @ 1068:54f06e95c2ee
Change logic to remove compilation warning
| author | Sebastien Decugis <sdecugis@freediameter.net> |
|---|---|
| date | Tue, 30 Apr 2013 10:58:06 +0800 |
| parents | e330166422ba |
| children | ac5c105cbc08 |
line wrap: on
line diff
--- a/libfdproto/ostr.c Tue Apr 30 09:51:09 2013 +0800 +++ b/libfdproto/ostr.c Tue Apr 30 10:58:06 2013 +0800 @@ -185,20 +185,21 @@ if *inoutsz is != 0 on entry, *id may not be \0-terminated. memory has the following meaning: 0: *id can be realloc'd. 1: *id must be malloc'd on output (was static) */ -#if defined(DIAMID_IDNA_IGNORE) || defined(DIAMID_IDNA_REJECT) -GCC_DIAG_OFF("-Wunused-but-set-variable") -#endif int fd_os_validate_DiameterIdentity(char ** id, size_t * inoutsz, int memory) { +#if defined(DIAMID_IDNA_IGNORE) || defined(DIAMID_IDNA_REJECT) int gotsize = 0; +#endif /* defined(DIAMID_IDNA_IGNORE) || defined(DIAMID_IDNA_REJECT) */ TRACE_ENTRY("%p %p", id, inoutsz); CHECK_PARAMS( id && *id && inoutsz ); if (!*inoutsz) *inoutsz = strlen(*id); +#if defined(DIAMID_IDNA_IGNORE) || defined(DIAMID_IDNA_REJECT) else gotsize = 1; +#endif /* defined(DIAMID_IDNA_IGNORE) || defined(DIAMID_IDNA_REJECT) */ #ifndef DIAMID_IDNA_IGNORE @@ -248,9 +249,6 @@ } return 0; } -#if defined(DIAMID_IDNA_IGNORE) || defined(DIAMID_IDNA_REJECT) -GCC_DIAG_ON("-Wunused-but-set-variable") -#endif /* Analyze a DiameterURI and return its components. Return EINVAL if the URI is not valid.