AC_HEADER_STDC is officially obsolescent

[catta] / avahi-common / utf8.c

diff --git a/avahi-common/utf8.c b/avahi-common/utf8.c
index f52ce552ac62d747c54caf2529f793b71cefe4e1..ab10ba06a05238ab8c505fb43939f13c9fb75387 100644 (file)
--- a/avahi-common/utf8.c
+++ b/avahi-common/utf8.c
@@ -1,5 +1,3 @@
-/* $Id */
-
 /* This file is based on the GLIB utf8 validation functions. The
  * original license text follows. */
 
@@ -37,8 +35,8 @@
      (((Char) & 0xFFFFF800) != 0xD800) &&     \
      ((Char) < 0xFDD0 || (Char) > 0xFDEF) &&  \
      ((Char) & 0xFFFE) != 0xFFFE)
-   
-     
+
+
 #define CONTINUATION_CHAR                           \
  do {                                     \
   if ((*(const unsigned char *)p & 0xc0) != 0x80) /* 10xxxxxx */ \
@@ -60,11 +58,8 @@ avahi_utf8_valid (const char *str)
     {
       if (*(const unsigned char *)p < 128)
        /* done */;
-      else 
+      else
        {
-         const char *last;
-         
-         last = p;
          if ((*(const unsigned char *)p & 0xe0) == 0xc0) /* 110xxxxx */
            {
              if ( ((*(const unsigned char *)p & 0x1e) == 0))
@@ -88,7 +83,7 @@ avahi_utf8_valid (const char *str)
                }
              else
                goto error;
-             
+
              p++;
              CONTINUATION_CHAR;
            TWO_REMAINING:
@@ -96,16 +91,16 @@ avahi_utf8_valid (const char *str)
              CONTINUATION_CHAR;
              p++;
              CONTINUATION_CHAR;
-             
+
              if ( (val < min))
                goto error;
 
              if ( (!UNICODE_VALID(val)))
                goto error;
-           } 
-         
+           }
+
          continue;
-         
+
        error:
          return NULL;
        }