From c84730c3f60cd04707636b1f30584913f0ea7a37 Mon Sep 17 00:00:00 2001
From: mccallum <mccallum@72102866-910b-0410-8b05-ffd578937521>
Date: Fri, 31 May 1996 15:13:58 +0000
Subject: [PATCH] Rename all o- files to o_.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@1608 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                          | 7 +++++++
 Headers/gnustep/base/NSHashTable.h | 2 +-
 Headers/gnustep/base/NSMapTable.h  | 2 +-
 Headers/gnustep/base/o_array.h     | 6 +++---
 Headers/gnustep/base/o_hash.h      | 4 ++--
 Headers/gnustep/base/o_list.h      | 8 ++++----
 Headers/gnustep/base/o_map.h       | 6 +++---
 Source/NSHashTable.m               | 2 +-
 Source/NSMapTable.m                | 2 +-
 Source/NSObject.m                  | 6 +++---
 Source/NSThread.m                  | 2 +-
 Source/SocketPort.m                | 2 +-
 Source/o_array.m                   | 4 ++--
 Source/o_hash.m                    | 2 +-
 Source/o_list.m                    | 4 ++--
 Source/o_map.m                     | 4 ++--
 16 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2d83622cd..486aa61a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 Fri May 31 10:06:05 1996  Andrew McCallum  <mccallum@cs.rochester.edu>
 
+	* src/Makefile.in: Rename all `o-*' files to `o_*', and prepend
+ 	`o_' to some related files.
+
+	* src/NSString.m ([NSString -initWithFormat:arguments:]): Increase
+ 	bsprintf buffer size, and assert that we haven't overrun the
+ 	buffer.
+
 	* src/Makefile.in (GNU_OTHER_SRCFILES): Added win32-entry.c and
  	win32-def.top.
 
diff --git a/Headers/gnustep/base/NSHashTable.h b/Headers/gnustep/base/NSHashTable.h
index d487d082a..3c2b65b86 100644
--- a/Headers/gnustep/base/NSHashTable.h
+++ b/Headers/gnustep/base/NSHashTable.h
@@ -30,7 +30,7 @@
 #include <Foundation/NSObject.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
-#include <gnustep/base/o-hash.h>
+#include <gnustep/base/o_hash.h>
 
 /**** Type, Constant, and Macro Definitions **********************************/
 
diff --git a/Headers/gnustep/base/NSMapTable.h b/Headers/gnustep/base/NSMapTable.h
index d5a7f9231..ec4e85355 100644
--- a/Headers/gnustep/base/NSMapTable.h
+++ b/Headers/gnustep/base/NSMapTable.h
@@ -30,7 +30,7 @@
 #include <Foundation/NSObject.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
-#include <gnustep/base/o-map.h>
+#include <gnustep/base/o_map.h>
 
 /**** Type, Constant, and Macro Definitions **********************************/
 
diff --git a/Headers/gnustep/base/o_array.h b/Headers/gnustep/base/o_array.h
index d81bff76d..1c7d0b30a 100644
--- a/Headers/gnustep/base/o_array.h
+++ b/Headers/gnustep/base/o_array.h
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <Foundation/NSZone.h>
 #include <gnustep/base/callbacks.h>
-#include <gnustep/base/o-hash.h>
+#include <gnustep/base/o_hash.h>
 
 /**** Type, Constant, and Macro Definitions **********************************/
 
@@ -82,8 +82,8 @@ struct _o_array_enumerator
 
 /** Basics **/
 
-#include <gnustep/base/o-array-bas.h>
-#include <gnustep/base/o-array-cbs.h>
+#include <gnustep/base/o_array_bas.h>
+#include <gnustep/base/o_array_cbs.h>
 
 /** Creating **/
 
diff --git a/Headers/gnustep/base/o_hash.h b/Headers/gnustep/base/o_hash.h
index ce709c053..f0b0ff3ad 100644
--- a/Headers/gnustep/base/o_hash.h
+++ b/Headers/gnustep/base/o_hash.h
@@ -115,8 +115,8 @@ struct _o_hash_enumerator
 /* All the structures (hashes, maps, lists, and arrays) have
  * the same basic ideas behind them. */
 
-#include <gnustep/base/o-hash-bas.h>
-#include <gnustep/base/o-hash-cbs.h>
+#include <gnustep/base/o_hash_bas.h>
+#include <gnustep/base/o_hash_cbs.h>
 
 /** Callbacks... **/
 
diff --git a/Headers/gnustep/base/o_list.h b/Headers/gnustep/base/o_list.h
index 3dc516a2e..43de621e5 100644
--- a/Headers/gnustep/base/o_list.h
+++ b/Headers/gnustep/base/o_list.h
@@ -29,8 +29,8 @@
 
 #include <Foundation/NSZone.h>
 #include <gnustep/base/callbacks.h>
-#include <gnustep/base/o-hash.h>
-#include <gnustep/base/o-array.h>
+#include <gnustep/base/o_hash.h>
+#include <gnustep/base/o_array.h>
 
 /**** Type, Constant, and Macro Definitions **********************************/
 
@@ -82,8 +82,8 @@ struct _o_list_enumerator
 
 /** Basics **/
 
-#include <gnustep/base/o-list-bas.h>
-#include <gnustep/base/o-list-cbs.h>
+#include <gnustep/base/o_list-bas.h>
+#include <gnustep/base/o_list-cbs.h>
 
 /** Creating **/
 
diff --git a/Headers/gnustep/base/o_map.h b/Headers/gnustep/base/o_map.h
index de4c09a3f..9f7aa5d45 100644
--- a/Headers/gnustep/base/o_map.h
+++ b/Headers/gnustep/base/o_map.h
@@ -29,7 +29,7 @@
 
 #include <Foundation/NSZone.h>
 #include <gnustep/base/callbacks.h>
-#include <gnustep/base/o-hash.h>
+#include <gnustep/base/o_hash.h>
 
 /**** Type, Constant, and Macro Definitions **********************************/
 
@@ -118,8 +118,8 @@ struct _o_map_enumerator
 /* All the structures (hashes, maps, lists, and arrays) have
  * the same basic ideas behind them. */
 
-#include <gnustep/base/o-map-bas.h>
-#include <gnustep/base/o-map-cbs.h>
+#include <gnustep/base/o_map_bas.h>
+#include <gnustep/base/o_map_cbs.h>
 
 /** Callbacks... **/
 
diff --git a/Source/NSHashTable.m b/Source/NSHashTable.m
index 49b0fd83a..8c1394c56 100644
--- a/Source/NSHashTable.m
+++ b/Source/NSHashTable.m
@@ -29,7 +29,7 @@
 #include <Foundation/NSArray.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSHashTable.h>
-#include <gnustep/base/o-hash.h>
+#include <gnustep/base/o_hash.h>
 #include "NSCallBacks.h"
 
 /**** Type, Constant, and Macro Definitions **********************************/
diff --git a/Source/NSMapTable.m b/Source/NSMapTable.m
index b7427ab19..3c4efa0e6 100644
--- a/Source/NSMapTable.m
+++ b/Source/NSMapTable.m
@@ -29,7 +29,7 @@
 #include <Foundation/NSArray.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSMapTable.h>
-#include <gnustep/base/o-map.h>
+#include <gnustep/base/o_map.h>
 #include "NSCallBacks.h"
 
 /**** Type, Constant, and Macro Definitions **********************************/
diff --git a/Source/NSObject.m b/Source/NSObject.m
index 54a8889db..e48c87d25 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -190,12 +190,12 @@ BOOL NSDecrementExtraRefCountWasZero (id anObject)
   struct objc_protocol_list* proto_list;
 
   for (proto_list = ((struct objc_class*)self)->class_pointer->protocols;
-       proto_list; proto_list = proto_list->next)
+       proto_list; proto_list = proto_list_>next)
     {
-      for (i=0; i < proto_list->count; i++)
+      for (i=0; i < proto_list_>count; i++)
       {
 	/* xxx We should add conformsToProtocol to Protocol class. */
-        if ([proto_list->list[i] conformsTo: aProtocol])
+        if ([proto_list_>list[i] conformsTo: aProtocol])
           return YES;
       }
     }
diff --git a/Source/NSThread.m b/Source/NSThread.m
index 5def1e56d..fd0931441 100644
--- a/Source/NSThread.m
+++ b/Source/NSThread.m
@@ -25,7 +25,7 @@
 #include <Foundation/NSThread.h>
 #include <Foundation/NSLock.h>
 #include <Foundation/NSString.h>
-#include <gnustep/base/o-map.h>
+#include <gnustep/base/o_map.h>
 #include <gnustep/base/Notification.h>
 
 // Notifications
diff --git a/Source/SocketPort.m b/Source/SocketPort.m
index 0dc18d82f..1f25fa5dc 100644
--- a/Source/SocketPort.m
+++ b/Source/SocketPort.m
@@ -28,7 +28,7 @@
 #include <sys/time.h>
 #endif /* !WIN32 */
 
-#include <objc/o-hash.h>
+#include <objc/o_hash.h>
 #include <gnustep/base/Lock.h>
 #include <objc/List.h>
 #include <gnustep/base/Connection.h>
diff --git a/Source/o_array.m b/Source/o_array.m
index 8353043b5..1ee3dc502 100644
--- a/Source/o_array.m
+++ b/Source/o_array.m
@@ -26,8 +26,8 @@
 
 #include <Foundation/NSZone.h>
 #include <gnustep/base/callbacks.h>
-#include <gnustep/base/o-array.h>
-#include <gnustep/base/o-hash.h>
+#include <gnustep/base/o_array.h>
+#include <gnustep/base/o_hash.h>
 
 /**** Function Implementations ***********************************************/
 
diff --git a/Source/o_hash.m b/Source/o_hash.m
index 231b28f20..6bb0f23b7 100644
--- a/Source/o_hash.m
+++ b/Source/o_hash.m
@@ -27,7 +27,7 @@
 #include <Foundation/NSZone.h>
 #include <gnustep/base/callbacks.h>
 #include <gnustep/base/numbers.h>
-#include <gnustep/base/o-hash.h>
+#include <gnustep/base/o_hash.h>
 
 /**** Function Implementations ***********************************************/
 
diff --git a/Source/o_list.m b/Source/o_list.m
index 2cd5b8cb2..b884cf244 100644
--- a/Source/o_list.m
+++ b/Source/o_list.m
@@ -26,8 +26,8 @@
 
 #include <Foundation/NSZone.h>
 #include <gnustep/base/callbacks.h>
-#include <gnustep/base/o-list.h>
-#include <gnustep/base/o-hash.h>
+#include <gnustep/base/o_list.h>
+#include <gnustep/base/o_hash.h>
 
 /**** Function Implementations ***********************************************/
 
diff --git a/Source/o_map.m b/Source/o_map.m
index ea3f7e7af..ad0ed784b 100644
--- a/Source/o_map.m
+++ b/Source/o_map.m
@@ -26,8 +26,8 @@
 
 #include <Foundation/NSZone.h>
 #include <gnustep/base/callbacks.h>
-#include <gnustep/base/o-hash.h>
-#include <gnustep/base/o-map.h>
+#include <gnustep/base/o_hash.h>
+#include <gnustep/base/o_map.h>
 
 /**** Function Implementations ***********************************************/