Avoid a name collision.

[tcpdump] / missing / snprintf.c

diff --git a/missing/snprintf.c b/missing/snprintf.c
index 49c70e61093d8fd9c4742979895e6a59c07b7b8f..3b21f31fbf053970292cb60cf9540ffba0cafb99 100644 (file)
--- a/missing/snprintf.c
+++ b/missing/snprintf.c
@@ -2,22 +2,22 @@
  * Copyright (c) 1995-1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  * Copyright (c) 1995-1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.

- * 
+ *

  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:

- * 
+ *

  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.

- * 
+ *

  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 
+ *

  * 3. Neither the name of the Institute nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 3. Neither the name of the Institute nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.

- * 
+ *

  * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE


@@ -31,24 +31,18 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-/* $Id: snprintf.c,v 1.2 2000-01-09 21:35:46 fenner Exp $ */
-

 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 

-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/snprintf.c,v 1.2 2000-01-09 21:35:46 fenner Exp $";
-#endif
-

 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>

+#include <sys/types.h>

 
 

-#include <interface.h>
+#include "netdissect.h"

 
 enum format_flags {
     minus_flag     =  1,
 
 enum format_flags {
     minus_flag     =  1,


@@ -92,6 +86,7 @@ sn_append_char (struct state *state, unsigned char c)
 }
 #endif
 
 }
 #endif
 

+#if 0

 static int
 as_reserve (struct state *state, size_t n)
 {
 static int
 as_reserve (struct state *state, size_t n)
 {


@@ -125,6 +120,7 @@ as_append_char (struct state *state, unsigned char c)
     return 0;
   }
 }
     return 0;
   }
 }

+#endif

 
 static int
 append_number(struct state *state,
 
 static int
 append_number(struct state *state,


@@ -211,7 +207,7 @@ append_number(struct state *state,
       state->s[-i-1] = state->s[-len+i];
       state->s[-len+i] = c;
     }
       state->s[-i-1] = state->s[-len+i];
       state->s[-len+i] = c;
     }

-    
+

   return 0;
 }
 
   return 0;
 }
 


@@ -255,13 +251,13 @@ append_char(struct state *state,
   while(!(flags & minus_flag) && --width > 0)
     if((*state->append_char) (state, ' '))
       return 1;
   while(!(flags & minus_flag) && --width > 0)
     if((*state->append_char) (state, ' '))
       return 1;

-    
+

   if((*state->append_char) (state, arg))
     return 1;
   while((flags & minus_flag) && --width > 0)
     if((*state->append_char) (state, ' '))
       return 1;
   if((*state->append_char) (state, arg))
     return 1;
   while((flags & minus_flag) && --width > 0)
     if((*state->append_char) (state, ' '))
       return 1;

-    
+

   return 0;
 }
 
   return 0;
 }
 


@@ -273,7 +269,7 @@ append_char(struct state *state,
 if (long_flag) \
      res = (unsig long)va_arg(arg, unsig long); \
 else if (short_flag) \
 if (long_flag) \
      res = (unsig long)va_arg(arg, unsig long); \
 else if (short_flag) \

-     res = (unsig short)va_arg(arg, unsig short); \
+     res = (unsig short)va_arg(arg, unsig int); \

 else \
      res = (unsig int)va_arg(arg, unsig int)
 
 else \
      res = (unsig int)va_arg(arg, unsig int)
 


@@ -310,7 +306,7 @@ xyzprintf (struct state *state, const char *char_format, va_list ap)
        else
          break;
       }
        else
          break;
       }

-      
+

       if((flags & space_flag) && (flags & plus_flag))
        flags ^= space_flag;
 
       if((flags & space_flag) && (flags & plus_flag))
        flags ^= space_flag;
 


@@ -362,7 +358,7 @@ xyzprintf (struct state *state, const char *char_format, va_list ap)
        if (append_string(state,
                          va_arg(ap, unsigned char*),
                          width,
        if (append_string(state,
                          va_arg(ap, unsigned char*),
                          width,

-                         prec, 
+                         prec,

                          flags))
          return -1;
        break;
                          flags))
          return -1;
        break;


@@ -460,13 +456,13 @@ xyzprintf (struct state *state, const char *char_format, va_list ap)
 
 #ifndef HAVE_SNPRINTF
 int
 
 #ifndef HAVE_SNPRINTF
 int

-snprintf (char *str, size_t sz, const char *format, ...)
+nd_snprintf (char *str, size_t sz, const char *format, ...)

 {
   va_list args;
   int ret;
 
   va_start(args, format);
 {
   va_list args;
   int ret;
 
   va_start(args, format);

-  ret = vsnprintf (str, sz, format, args);
+  ret = nd_vsnprintf (str, sz, format, args);

 
 #ifdef PARANOIA
   {
 
 #ifdef PARANOIA
   {


@@ -489,6 +485,7 @@ snprintf (char *str, size_t sz, const char *format, ...)
 }
 #endif
 
 }
 #endif
 

+#if 0

 #ifndef HAVE_ASPRINTF
 int
 asprintf (char **ret, const char *format, ...)
 #ifndef HAVE_ASPRINTF
 int
 asprintf (char **ret, const char *format, ...)


@@ -521,13 +518,13 @@ asprintf (char **ret, const char *format, ...)
 
 #ifndef HAVE_ASNPRINTF
 int
 
 #ifndef HAVE_ASNPRINTF
 int

-asnprintf (char **ret, size_t max_sz, const char *format, ...)
+nd_asnprintf (char **ret, size_t max_sz, const char *format, ...)

 {
   va_list args;
   int val;
 
   va_start(args, format);
 {
   va_list args;
   int val;
 
   va_start(args, format);

-  val = vasnprintf (ret, max_sz, format, args);
+  val = nd_vasnprintf (ret, max_sz, format, args);

 
 #ifdef PARANOIA
   {
 
 #ifdef PARANOIA
   {


@@ -553,14 +550,14 @@ asnprintf (char **ret, size_t max_sz, const char *format, ...)
 int
 vasprintf (char **ret, const char *format, va_list args)
 {
 int
 vasprintf (char **ret, const char *format, va_list args)
 {

-  return vasnprintf (ret, 0, format, args);
+  return nd_vasnprintf (ret, 0, format, args);

 }
 #endif
 
 
 #ifndef HAVE_VASNPRINTF
 int
 }
 #endif
 
 
 #ifndef HAVE_VASNPRINTF
 int

-vasnprintf (char **ret, size_t max_sz, const char *format, va_list args)
+nd_vasnprintf (char **ret, size_t max_sz, const char *format, va_list args)

 {
   int st;
   size_t len;
 {
   int st;
   size_t len;


@@ -599,10 +596,11 @@ vasnprintf (char **ret, size_t max_sz, const char *format, va_list args)
   }
 }
 #endif
   }
 }
 #endif

+#endif

 
 #ifndef HAVE_VSNPRINTF
 int
 
 #ifndef HAVE_VSNPRINTF
 int

-vsnprintf (char *str, size_t sz, const char *format, va_list args)
+nd_vsnprintf (char *str, size_t sz, const char *format, va_list args)

 {
   struct state state;
   int ret;
 {
   struct state state;
   int ret;