* device/include/pic16/stdlib.h,

* device/lib/pic16/libc/stdlib/ltoa.c,
* device/lib/pic16/libc/stdio/vfprintf.c: ascii strings are char*

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5008 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 32a26929761ff816806cb0ec6f6f6449de9ba6e6..c31c4d38ca55cddf830aad8bc96bbe0a5a6fcacd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-13 Maarten Brock <sourceforge.brock AT dse.nl>
+
+       * device/include/pic16/stdlib.h,
+       * device/lib/pic16/libc/stdlib/ltoa.c,
+       * device/lib/pic16/libc/stdio/vfprintf.c: ascii strings are char*
+
 2008-02-13 Borut Razem <borut.razem AT siol.net>
 
        * src/SDCCmain.c, src/SDCCglue.c: fixed --c1mode

diff --git a/device/include/pic16/stdlib.h b/device/include/pic16/stdlib.h
index d6f1c4b738060da289c76dcf4267bbe1cf0eacde..bda5dd7e746d091657295287c47ed76ffb01a448 100644 (file)
--- a/device/include/pic16/stdlib.h
+++ b/device/include/pic16/stdlib.h
@@ -2,7 +2,7 @@
   stdlib.h - ANSI functions forward declarations
 
    Ported to PIC16 port by Vangelis Rokas, 2004 (vrokas@otenet.gr)
-   
+
              Written By -  Sandeep Dutta . sandeep.dutta@usa.net (1998)
 
    This program is free software; you can redistribute it and/or modify it
@@ -71,8 +71,8 @@ void uitoa(unsigned int, __data char *, unsigned char);
 void itoa(int, __data char*, unsigned char);
 
 /* convert an unsigned/signed long integer to ASCII string */
-void ultoa(unsigned long, __data unsigned char *, unsigned char);
-void ltoa(long, __data unsigned char*, unsigned char);
+void ultoa(unsigned long, __data char *, unsigned char);
+void ltoa(long, __data char*, unsigned char);
 
 /* helper functions: convert a float to ASCII string */
 extern char x_ftoa(float, __data char *, unsigned char, unsigned char);

diff --git a/device/lib/pic16/libc/stdio/vfprintf.c b/device/lib/pic16/libc/stdio/vfprintf.c
index 7a296920ddee1e618b41937e53298c86d75c3f3e..f413180b7c9ebcab012546884f9695b37c1143c2 100644 (file)
--- a/device/lib/pic16/libc/stdio/vfprintf.c
+++ b/device/lib/pic16/libc/stdio/vfprintf.c
@@ -2,7 +2,7 @@
     vfprintf.c - source file for reduced version of printf
 
     Modified for pic16 port, by Vangelis Rokas, 2005 (vrokas@otenet.gr)
-    
+
     Written By - Sandeep Dutta . sandeep.dutta@usa.net (1999)
 
     This library is free software; you can redistribute it and/or modify it
@@ -66,7 +66,7 @@ unsigned int vfprintf(FILE *stream, char *fmt, va_list ap)
   unsigned char fchar, nosign;
   unsigned char upcase;
   unsigned int count=0;
-  unsigned char *str, *ch;
+  char *str, *ch;
   __data char *str1;
   long val;
 //  static char buffer[16];
@@ -81,7 +81,7 @@ unsigned int vfprintf(FILE *stream, char *fmt, va_list ap)
 
 //    va_start(ap,fmt);
   ch = fmt;
-    
+
   while( *ch ) {      //for (; *fmt ; fmt++ )
     if (*ch == '%') {
       flong = 0;

diff --git a/device/lib/pic16/libc/stdlib/ltoa.c b/device/lib/pic16/libc/stdlib/ltoa.c
index 9106cc27a286d3f99a7b183046dc7172bd026d18..428d4dcb0d5e8f6282c489570bb0580440842df3 100644 (file)
--- a/device/lib/pic16/libc/stdlib/ltoa.c
+++ b/device/lib/pic16/libc/stdlib/ltoa.c
@@ -21,14 +21,14 @@ extern void io_str(char *);
 #endif
 
 
-void ultoa(unsigned long value, __data unsigned char* str, unsigned char radix)
+void ultoa(unsigned long value, __data char* str, unsigned char radix)
 {
   unsigned int index;
   unsigned char ch;
   unsigned char buffer[NUMBER_OF_DIGITS];  /* space for NUMBER_OF_DIGITS + '\0' */
 
     index = NUMBER_OF_DIGITS;
-  
+
     do {
       ch = '0' + (value % radix);
       if ( ch > '9') ch += 'a' - '9' - 1;
@@ -50,7 +50,7 @@ void ultoa(unsigned long value, __data unsigned char* str, unsigned char radix)
     *str = 0;  /* string terminator */
 }
 
-void ltoa(long value, __data unsigned char* str, unsigned char radix)
+void ltoa(long value, __data char* str, unsigned char radix)
 {
 #if _DEBUG
   io_str( "ltoa: " );