@@ -74,7 +74,7 @@ typedef unsigned long ulong_long;
7474 * causing nast effects.
7575 **************************************************************/
7676
77- /*static char _id[] = "$Id: snprintf.c,v 1.28 2000/12/03 20:45:34 tgl Exp $";*/
77+ /*static char _id[] = "$Id: snprintf.c,v 1.29 2000/12/30 19:17:47 tgl Exp $";*/
7878static char * end ;
7979static int SnprfOverflow ;
8080
@@ -192,12 +192,12 @@ dopr(char *buffer, const char *format, va_list args)
192192if (longflag )
193193{
194194if (longlongflag )
195- value = va_arg (args ,long_long );
195+ value = va_arg (args ,ulong_long );
196196else
197- value = va_arg (args ,long );
197+ value = va_arg (args ,unsigned long );
198198}
199199else
200- value = va_arg (args ,int );
200+ value = va_arg (args ,unsigned int );
201201fmtnum (value ,10 ,0 ,ljust ,len ,zpad );
202202break ;
203203case 'o' :
@@ -206,12 +206,12 @@ dopr(char *buffer, const char *format, va_list args)
206206if (longflag )
207207{
208208if (longlongflag )
209- value = va_arg (args ,long_long );
209+ value = va_arg (args ,ulong_long );
210210else
211- value = va_arg (args ,long );
211+ value = va_arg (args ,unsigned long );
212212}
213213else
214- value = va_arg (args ,int );
214+ value = va_arg (args ,unsigned int );
215215fmtnum (value ,8 ,0 ,ljust ,len ,zpad );
216216break ;
217217case 'd' :
@@ -225,31 +225,30 @@ dopr(char *buffer, const char *format, va_list args)
225225}
226226else
227227value = va_arg (args ,int );
228-
229228fmtnum (value ,10 ,1 ,ljust ,len ,zpad );
230229break ;
231230case 'x' :
232231if (longflag )
233232{
234233if (longlongflag )
235- value = va_arg (args ,long_long );
234+ value = va_arg (args ,ulong_long );
236235else
237- value = va_arg (args ,long );
236+ value = va_arg (args ,unsigned long );
238237}
239238else
240- value = va_arg (args ,int );
239+ value = va_arg (args ,unsigned int );
241240fmtnum (value ,16 ,0 ,ljust ,len ,zpad );
242241break ;
243242case 'X' :
244243if (longflag )
245244{
246245if (longlongflag )
247- value = va_arg (args ,long_long );
246+ value = va_arg (args ,ulong_long );
248247else
249- value = va_arg (args ,long );
248+ value = va_arg (args ,unsigned long );
250249}
251250else
252- value = va_arg (args ,int );
251+ value = va_arg (args ,unsigned int );
253252fmtnum (value ,-16 ,0 ,ljust ,len ,zpad );
254253break ;
255254case 's' :