Changeset 2922

Timestamp:

Mar 27, 2012 10:00:03 PM (14 months ago)

Author:

wmb

Message:

Client library - fixed residual problem from recent cleanup.

Location:

clients/lib

Files:

• 1275.h (modified) (2 diffs)
• lib.c (modified) (2 diffs)
• string.h (modified) (1 diff)
• strings.c (modified) (1 diff)

clients/lib/1275.h

@@ -43 +43 @@
 
 extern int   decode_int(UCHAR *);
-extern void  exit(int);
 extern void  fatal(char *fmt, ...);
-extern void  free(void *);
 extern cell_t get_cell_prop(phandle, char *);
 extern cell_t get_cell_prop_def(phandle, char *, cell_t);
@@ -51 +49 @@
 extern int   get_int_prop_def(phandle, char *, int);
 extern char *get_str_prop(phandle, const char *, allocflag);
-extern void *malloc(size_t);
-extern void  memcpy(void *, void *, size_t);
-extern void  memset(void *, int, size_t);
-extern int   memcmp(const void *, const void *, size_t);
 extern int   printf(char *fmt, ...);
-extern void  putchar(UCHAR);
-extern void *realloc(void *, size_t);
+extern int   putchar(int);
 extern void  warn(char *fmt, ...);
 extern void *zalloc(size_t);

clients/lib/lib.c

@@ -130 +130 @@
 
 int
-fputc(char c, FILE *fp)
+fputc(int c, FILE *fp)
 {
   if (fp->readonly)
     return -1;  // EOF
 
-  if (fp == stdout && c == '\n')
+  if (fp == stdout && (unsigned char)c == '\n')
     (void) fputc('\r', fp);
 
-  fp->buf[fp->bufc++] = c;
+  fp->buf[fp->bufc++] = (unsigned char)c;
   fp->dirty = 1;
 
-  if ((fp->bufc == 127) || (fp == stdout && c == '\n')) {
+  if ((fp->bufc == 127) || (fp == stdout && (unsigned char)c == '\n')) {
     OFWrite(fp->id, fp->buf, fp->bufc);
     fp->bufc = 0;
     fp->dirty = 0;
   }
-  return (int)c;
+  return (int)(unsigned char)c;
 }
 
@@ -217 +217 @@
 }
 
-void
-putchar(UCHAR c)
+int
+putchar(int c)
 {
   fputc(c, stdout);

clients/lib/string.h

@@ -15 +15 @@
 char *strstr(const char *haystack, const char *needle);
 char *strcasestr(const char *haystack, const char *needle);
-const void *memchr(const void *s, int c, size_t len);
+void *memchr(const void *s, int c, size_t len);
+void *memcpy(void *dest, const void *src, size_t n);
+int memcmp(const void *s1, const void *s2, size_t n);
+void *memset(void *s, int c, size_t n);
 int toupper(int c);

clients/lib/strings.c

@@ -189 +189 @@
 }
 
-const void *memchr(const void *s, int c, size_t len)
+void *memchr(const void *s, int c, size_t len)
 {
         const unsigned char *p = s;