From 6688ff9af3d88c1bda9aeea50ed6701561a01479 Mon Sep 17 00:00:00 2001
From: David Wetzel <dave@turbocat.de>
Date: Thu, 28 Dec 2017 13:35:30 -0500
Subject: [PATCH]     * gsweb.make.in     * GNUmakefile       remove
 GSWExtensionsGSW as this is depricated now.     * GSWeb/GSWDefaultAdaptor.m  
     added retain/autorelease     * GSWUtils.m       removed category on
 NSUserDefaults     * GSWDefaultAdaptor.m       removed _workerThreadCountMax
 = 16

---
 ChangeLog                  | 10 ++++++++++
 GNUmakefile                |  2 +-
 GSWeb/GSWDefaultAdaptor.m  |  5 ++---
 GSWeb/GSWDictionary.h      |  0
 GSWeb/GSWDictionary.m      |  0
 GSWeb/GSWPrivate.h         |  0
 GSWeb/GSWUtils.m           | 22 ----------------------
 GSWeb/GSWWOCompatibility.h |  0
 GSWeb/GSWWorkerThread.h    |  0
 GSWeb/GSWeb.h              |  0
 gsweb.make.in              |  2 +-
 11 files changed, 14 insertions(+), 27 deletions(-)
 mode change 100755 => 100644 ChangeLog
 mode change 100644 => 100755 GNUmakefile
 mode change 100755 => 100644 GSWeb/GSWDictionary.h
 mode change 100755 => 100644 GSWeb/GSWDictionary.m
 mode change 100755 => 100644 GSWeb/GSWPrivate.h
 mode change 100755 => 100644 GSWeb/GSWWOCompatibility.h
 mode change 100755 => 100644 GSWeb/GSWWorkerThread.h
 mode change 100755 => 100644 GSWeb/GSWeb.h

diff --git a/ChangeLog b/ChangeLog
old mode 100755
new mode 100644
index 991b0f7..24564a2
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-12-28  David Wetzel <dave@turbocat.de>
+    * gsweb.make.in
+    * GNUmakefile
+      remove GSWExtensionsGSW as this is depricated now.
+    * GSWeb/GSWDefaultAdaptor.m
+      added retain/autorelease
+    * GSWUtils.m
+      removed category on NSUserDefaults
+    * GSWDefaultAdaptor.m
+      removed _workerThreadCountMax = 16
 2017-12-25  David Wetzel <dave@turbocat.de>
     * GSWDatabase/WODisplayGroup.m
       fix format string and NSArray / NSMutableArray bugs
diff --git a/GNUmakefile b/GNUmakefile
old mode 100644
new mode 100755
index 1c56679..564266a
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -49,9 +49,9 @@ include ./config.mak
 #
 SUBPROJECTS = GSWeb \
 	GSWExtensions \
-	GSWExtensionsGSW \
 	GSWDatabase
 
+#	GSWExtensionsGSW \
 #GSWAdaptors
 
 -include Makefile.preamble
diff --git a/GSWeb/GSWDefaultAdaptor.m b/GSWeb/GSWDefaultAdaptor.m
index b4bacef..cd48e80 100644
--- a/GSWeb/GSWDefaultAdaptor.m
+++ b/GSWeb/GSWDefaultAdaptor.m
@@ -103,9 +103,6 @@ static GSWResponse * static_lastDitchErrorResponse = nil;
       _isMultiThreadEnabled=[[arguments objectForKey:GSWOPT_MultiThreadEnabled] boolValue];
       ASSIGN(_adaptorHost,[arguments objectForKey:GSWOPT_AdaptorHost[GSWebNamingConv]]);
       
-        // for now...
-        _workerThreadCountMax = 16;
-
       if ((_workerThreadCountMax <1) || (_isMultiThreadEnabled == NO)) {
         _workerThreadCountMax = 1;
         _isMultiThreadEnabled = NO;
@@ -194,11 +191,13 @@ void _queueWorkOnHandle(NSFileHandle* handle, NSMutableArray* waitingThreadArray
 - (void) workerThreadWillExit:(GSWWorkerThread*) thread
 {
   [_selfLock lock];
+  [thread retain];
        [_threads removeObject: thread];
        if ([_waitingThreads count]) {
          _workOnHandle([_waitingThreads objectAtIndex:0], self, _threads, _isMultiThreadEnabled);
          [_waitingThreads removeObjectAtIndex:0]; 
        }
+  [thread autorelease];
   [_selfLock unlock];
 }
 
diff --git a/GSWeb/GSWDictionary.h b/GSWeb/GSWDictionary.h
old mode 100755
new mode 100644
diff --git a/GSWeb/GSWDictionary.m b/GSWeb/GSWDictionary.m
old mode 100755
new mode 100644
diff --git a/GSWeb/GSWPrivate.h b/GSWeb/GSWPrivate.h
old mode 100755
new mode 100644
diff --git a/GSWeb/GSWUtils.m b/GSWeb/GSWUtils.m
index 4fd5213..db61372 100644
--- a/GSWeb/GSWUtils.m
+++ b/GSWeb/GSWUtils.m
@@ -1365,28 +1365,6 @@ NSString* GSWGetDefaultDocRoot()
 };
 @end
 
-//====================================================================
-//TODO
-#ifdef GNUSTEP
-@implementation NSUserDefaults (Description)
-
-//--------------------------------------------------------------------
--(NSString*)description
-{
-  return (*nsString_stringWithFormatIMP)(nsStringClass,stringWithFormatSEL,@"<%s %p - searchList:\n%@\n persDomains:\n%@\n tempDomains:\n%@\n changedDomains:\n%@\n dictionaryRep:\n%@\n defaultsDatabase:\n%@\n>",
-                   object_getClassName(self),
-                   (void*)self,
-                   _searchList,
-                   _persDomains,
-                   _tempDomains,
-                   _changedDomains,
-                   _dictionaryRep,
-                   _defaultsDatabase);
-};
-
-@end
-#endif
-
 //====================================================================
 @implementation NSDictionary (FromNSArray)
 
diff --git a/GSWeb/GSWWOCompatibility.h b/GSWeb/GSWWOCompatibility.h
old mode 100755
new mode 100644
diff --git a/GSWeb/GSWWorkerThread.h b/GSWeb/GSWWorkerThread.h
old mode 100755
new mode 100644
diff --git a/GSWeb/GSWeb.h b/GSWeb/GSWeb.h
old mode 100755
new mode 100644
diff --git a/gsweb.make.in b/gsweb.make.in
index 459ea81..31cc832 100644
--- a/gsweb.make.in
+++ b/gsweb.make.in
@@ -29,7 +29,7 @@ GSWEB_MINOR_VERSION = @MINOR_VERSION@
 GSWEB_SUBMINOR_VERSION = @SUBMINOR_VERSION@
 
 ifeq ($(GSW_NAMES),wo)
-  AUXILIARY_GSW_LIBS += -lWebObjects -lWOExtensions -lWOExtensionsGSW
+  AUXILIARY_GSW_LIBS += -lWebObjects -lWOExtensions 
 else
 #  AUXILIARY_GSW_LIBS += -lGSWeb -lGSWExtensions -lGSWExtensionsGSW
 endif