* objc/archive.c: Remove <string.h> prototypes.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@20769 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5244d2c..7b99709 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 27 23:02:04 1998  Richard Henderson  <rth@cygnus.com>
+
+       * objc/archive.c: Remove <string.h> prototypes.
+
 Sat Jun 27 22:37:05 1998  Jeffrey A Law  (law@cygnus.com)
 
        * tm.texi (NEED_MATH_LIBRARY): Document new target macro.

diff --git a/gcc/objc/archive.c b/gcc/objc/archive.c
index 2edb056..c762fe6 100644 (file)
--- a/gcc/objc/archive.c
+++ b/gcc/objc/archive.c
@@ -24,10 +24,15 @@ Boston, MA 02111-1307, USA.  */
    however invalidate any other reasons why the executable file might be
    covered by the GNU General Public License.  */
 
+#include "config.h"
 #include "runtime.h"
 #include "typedstream.h"
 #include "encoding.h"
 
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
 extern int fflush(FILE*);
 
 #define ROUND(V, A) \
@@ -357,8 +362,11 @@ __objc_write_extension (struct objc_typed_stream* stream, unsigned char code)
       return (*stream->write)(stream->physical, &buf, 1);
     }
   else 
-    objc_error(nil, OBJC_ERR_BAD_OPCODE,
-              "__objc_write_extension: bad opcode %c\n", code);
+    {
+      objc_error(nil, OBJC_ERR_BAD_OPCODE,
+                "__objc_write_extension: bad opcode %c\n", code);
+      return -1;
+    }
 }
 
 __inline__ int
@@ -391,7 +399,7 @@ objc_write_object_reference (struct objc_typed_stream* stream, id object)
 int 
 objc_write_root_object (struct objc_typed_stream* stream, id object)
 {
-  int len;
+  int len = 0;
   if (stream->writing_root_p)
     objc_error (nil, OBJC_ERR_RECURSE_ROOT, 
                "objc_write_root_object called recursively");
@@ -426,12 +434,6 @@ objc_write_object (struct objc_typed_stream* stream, id object)
     }
 }
 
-#ifdef __alpha__
-extern int atoi (const char*);
-extern size_t strlen(const char*);
-extern size_t strcpy(char*, const char*);
-#endif
-
 __inline__ int
 __objc_write_class (struct objc_typed_stream* stream, struct objc_class* class)
 {
@@ -1065,8 +1067,11 @@ objc_write_type(TypedStream* stream, const char* type, const void* data)
     }
 
   default:
-    objc_error(nil, OBJC_ERR_BAD_TYPE,
-              "objc_write_type: cannot parse typespec: %s\n", type);
+    {
+      objc_error(nil, OBJC_ERR_BAD_TYPE,
+                "objc_write_type: cannot parse typespec: %s\n", type);
+      return 0;
+    }
   }
 }
 
@@ -1158,8 +1163,11 @@ objc_read_type(TypedStream* stream, const char* type, void* data)
     }
 
   default:
-    objc_error(nil, OBJC_ERR_BAD_TYPE,
-              "objc_read_type: cannot parse typespec: %s\n", type);
+    {
+      objc_error(nil, OBJC_ERR_BAD_TYPE,
+                "objc_read_type: cannot parse typespec: %s\n", type);
+      return 0;
+    }
   }
 }
 
@@ -1423,12 +1431,14 @@ static int
 __objc_no_write(FILE* file, char* data, int len)
 {
   objc_error (nil, OBJC_ERR_NO_WRITE, "TypedStream not open for writing");
+  return 0;
 }
 
 static int 
 __objc_no_read(FILE* file, char* data, int len)
 {
   objc_error (nil, OBJC_ERR_NO_READ, "TypedStream not open for reading");
+  return 0;
 }
 
 static int