X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/34ff77ff4318038a1c9f8d31e4bb50ad5ba10cd1..f5fe14663d9ed32b7a995ed0924c04e705f74237:/missing/snprintf.c?ds=sidebyside

diff --git a/missing/snprintf.c b/missing/snprintf.c
index 49c70e61..921b74c1 100644
--- 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.
- * 
+ *
  * 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.
- * 
+ *
  * 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.
- * 
+ *
  * 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.
  */
 
-/* $Id: snprintf.c,v 1.2 2000-01-09 21:35:46 fenner Exp $ */
-
 #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 <sys/types.h>
 
-#include <interface.h>
+#include "netdissect.h"
 
 enum format_flags {
     minus_flag     =  1,
@@ -92,6 +86,7 @@ sn_append_char (struct state *state, unsigned char c)
 }
 #endif
 
+#if 0
 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;
   }
 }
+#endif
 
 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;
     }
-    
+
   return 0;
 }
 
@@ -255,13 +251,13 @@ append_char(struct state *state,
   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;
 }
 
@@ -273,7 +269,7 @@ append_char(struct state *state,
 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)
 
@@ -310,7 +306,7 @@ xyzprintf (struct state *state, const char *char_format, va_list ap)
 	else
 	  break;
       }
-      
+
       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,
-			  prec, 
+			  prec,
 			  flags))
 	  return -1;
 	break;
@@ -489,6 +485,7 @@ snprintf (char *str, size_t sz, const char *format, ...)
 }
 #endif
 
+#if 0
 #ifndef HAVE_ASPRINTF
 int
 asprintf (char **ret, const char *format, ...)
@@ -599,6 +596,7 @@ vasnprintf (char **ret, size_t max_sz, const char *format, va_list args)
   }
 }
 #endif
+#endif
 
 #ifndef HAVE_VSNPRINTF
 int