Changeset 1068:54f06e95c2ee in freeDiameter for libfdproto

Timestamp:

Apr 30, 2013, 11:58:06 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Change logic to remove compilation warning

File:

• libfdproto/ostr.c (modified) (3 diffs)

libfdproto/ostr.c

@@ -186 +186 @@
  memory has the following meaning: 0: *id can be realloc'd. 1: *id must be malloc'd on output (was static)
 */
+int fd_os_validate_DiameterIdentity(char ** id, size_t * inoutsz, int memory)
+{
 #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)
-{
         int gotsize = 0;
+#endif /* defined(DIAMID_IDNA_IGNORE) || defined(DIAMID_IDNA_REJECT) */
         
         TRACE_ENTRY("%p %p", id, inoutsz);
@@ -198 +197 @@
         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
@@ -249 +250 @@
         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.