From c9bb4eebda78a8dab614e32e6b537175496745df Mon Sep 17 00:00:00 2001
From: alexm <alexm@72102866-910b-0410-8b05-ffd578937521>
Date: Wed, 20 Aug 2003 12:13:34 +0000
Subject: [PATCH] Don't return values from methods returning void.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@17502 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                   |  8 ++++++++
 Source/GSString.m           |  8 ++++----
 Source/NSArchiver.m         |  2 +-
 Source/NSAttributedString.m |  6 +++---
 Source/NSRunLoop.m          | 10 +++++-----
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a2416ab2c..cc7ac9310 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-20 13:59  Alexander Malmberg <alexander@malmberg.org>
+
+	Clean up code to remove warnings issued by (what will become)
+	gcc 3.4.
+
+	* Source/GSString.m, Source/NSArchiver.m, Source/NSAttributedString.m,
+	Source/NSRunLoop.m: Don't return values from methods returning void.
+
 2003-08-19  Adam Fedor  <fedor@gnu.org>
 
 	* configure.ac: Clarify ffi interface warnings and disable_do on
diff --git a/Source/GSString.m b/Source/GSString.m
index d06eb3b60..151e9d2f3 100644
--- a/Source/GSString.m
+++ b/Source/GSString.m
@@ -811,7 +811,7 @@ cString_c(ivars self)
 	}
       NSZoneFree(NSDefaultMallocZone(), u);
     }
-  
+
   return r;
 }
 
@@ -1127,7 +1127,7 @@ getCString_u(ivars self, char *buffer, unsigned int maxLength,
   can't deal with our leftoverRange case, so we need to use a bit of
   complexity instead. */
   unsigned int len;
-
+  
   /* TODO: this is an extremely ugly hack to work around buggy iconvs
   that return -1/E2BIG for buffers larger than 0x40000acf */
   if (maxLength > 0x40000000)
@@ -3398,12 +3398,12 @@ transmute(ivars self, NSString *aString)
 
 - (void) getCharacters: (unichar*)buffer
 {
-  return [_parent getCharacters: buffer];
+  [_parent getCharacters: buffer];
 }
 
 - (void) getCharacters: (unichar*)buffer range: (NSRange)aRange
 {
-  return [_parent getCharacters: buffer range: aRange];
+  [_parent getCharacters: buffer range: aRange];
 }
 
 - (void) getCString: (char*)buffer
diff --git a/Source/NSArchiver.m b/Source/NSArchiver.m
index 9dbad649e..c011d0f7e 100644
--- a/Source/NSArchiver.m
+++ b/Source/NSArchiver.m
@@ -161,7 +161,7 @@ static Class	NSMutableDataMallocClass;
 	}
       NSZoneFree(_clsMap->zone, (void*)_clsMap);
     }
-  return [super dealloc];
+  [super dealloc];
 }
 
 + (NSData*) archivedDataWithRootObject: (id)rootObject
diff --git a/Source/NSAttributedString.m b/Source/NSAttributedString.m
index 090f0599a..2fa482f4f 100644
--- a/Source/NSAttributedString.m
+++ b/Source/NSAttributedString.m
@@ -887,12 +887,12 @@ static Class GSMutableAttributedStringClass;
 
 - (void)getCharacters: (unichar*)buffer
 {
-  return [[_owner string] getCharacters: buffer];
+  [[_owner string] getCharacters: buffer];
 }
 
 - (void)getCharacters: (unichar*)buffer range: (NSRange)aRange
 {
-  return [[_owner string] getCharacters: buffer range: aRange];
+  [[_owner string] getCharacters: buffer range: aRange];
 }
 
 - (const char*) cString
@@ -922,7 +922,7 @@ static Class GSMutableAttributedStringClass;
 
 - (void) encodeWithCoder: (NSCoder*)aCoder
 {
-  return [[_owner string] encodeWithCoder: aCoder];
+  [[_owner string] encodeWithCoder: aCoder];
 }
 
 - (Class) classForCoder
diff --git a/Source/NSRunLoop.m b/Source/NSRunLoop.m
index 1df4a11b1..dbc161892 100644
--- a/Source/NSRunLoop.m
+++ b/Source/NSRunLoop.m
@@ -2101,10 +2101,10 @@ static void setPollfd(int fd, int event, GSRunLoopCtxt *ctxt)
 - (void) addPort: (NSPort*)port
          forMode: (NSString*)mode
 {
-  return [self addEvent: (void*)port
-		   type: ET_RPORT
-		watcher: (id<RunLoopEvents>)port
-		forMode: (NSString*)mode];
+  [self addEvent: (void*)port
+	    type: ET_RPORT
+	 watcher: (id<RunLoopEvents>)port
+	 forMode: (NSString*)mode];
 }
 
 /**
@@ -2256,7 +2256,7 @@ static void setPollfd(int fd, int event, GSRunLoopCtxt *ctxt)
 - (void) removePort: (NSPort*)port
             forMode: (NSString*)mode
 {
-  return [self removeEvent: (void*)port type: ET_RPORT forMode: mode all: NO];
+  [self removeEvent: (void*)port type: ET_RPORT forMode: mode all: NO];
 }
 
 @end