Changeset 227 for trunk/foundation/class_c

Timestamp:

Feb 4, 2007, 10:51:43 PM (19 years ago)

Author:

cinc

Message:

Changed string and path classes not to return always copies but only when necessary.

Location:

trunk/foundation/class_c

Files:

• nomfilepath.c (modified) (8 diffs)
• nomstring.c (modified) (5 diffs)

trunk/foundation/class_c/nomfilepath.c

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2006
+* Portions created by the Initial Developer are Copyright (C) 2006-2007
 * the Initial Developer. All Rights Reserved.
 *
@@ -55 +55 @@
   added to the path prior to appending. If the given string starts with a separator and the current
   path ends with a separator the ending separator will be removed before appending.
+  If no input path is given only a separator is appended if necessary.
 
   Note that there's no check if the input string is an absolute path. So if an absolute path is given as
@@ -72 +73 @@
     return NOMPath_appendSeparator(nomSelf, ev);
 
+  /* This is not a copy */
   chrTemp=NOMPath_queryCString(nomPath, NULLHANDLE);
   if(G_DIR_SEPARATOR==chrTemp[0])
     np=NOMPath_stripSeparator(nomSelf, ev);
-  else{
+  else
     np=NOMPath_appendSeparator(nomSelf, ev); /* Make sure current path has a separator */
-  }
 
   return (NOMPath*) NOMPath_append((NOMString*) np, (NOMString*)nomPath, NULLHANDLE);
@@ -84 +85 @@
 /**
   Append a separator to the path. If the path already has a separator at the end this method does
-  nothing other than returning a new path object. If the given path has zero length a path object
+  nothing other than returning the path object. If the given path has zero length the path object
   only holding a separator is returned.
  
@@ -94 +95 @@
   gulong len;
 
+  /* Return only a separator */
   if((len=NOMPath_length((NOMString*)nomSelf, ev))==0)
     return (NOMPath*)NOMPath_appendCString((NOMString*)nomSelf, G_DIR_SEPARATOR_S, ev);
 
+  /* Add a separator */
   if(G_DIR_SEPARATOR!=chrTemp[len-1])
     return (NOMPath*)NOMPath_appendCString( (NOMString*)nomSelf, G_DIR_SEPARATOR_S, ev);
 
-  return (PNOMPath)NOMPath_copy(nomSelf, NULLHANDLE);
+  return nomSelf;
 }
 
@@ -106 +109 @@
   Strips the path separator from the end of a path if there's one.
 
-  This method always returns a new instance of a NOMPath owned by the caller.
+  This method returns the same instance of a NOMPath.
  */
 NOM_Scope PNOMPath NOMLINK impl_NOMPath_stripSeparator(NOMPath* nomSelf, CORBA_Environment *ev)
@@ -114 +117 @@
 
   if((len=NOMPath_length((NOMString*)nomSelf, NULLHANDLE))==0)
-    return (PNOMPath)NOMPath_copy(nomSelf, NULLHANDLE);
-
+    return nomSelf;
+
+  /* This is not a copy */
   chrTemp=NOMPath_queryCString((NOMString*)nomSelf, NULLHANDLE);
 
@@ -121 +125 @@
     return (NOMPath*)NOMPath_truncate( (NOMString*)nomSelf, len-1, NULLHANDLE);
 
-  return (PNOMPath)NOMPath_copy(nomSelf, NULLHANDLE);
+  return nomSelf;
 }
 

trunk/foundation/class_c/nomstring.c

@@ -90 +90 @@
 {
   NOMStringData* nomThis=NOMStringGetData(nomSelf);
-  PNOMString nomRetval=(PNOMString) NOMString_new(nomSelf, NULLHANDLE);
-  GString* gStrTmp;
 
-  gStrTmp=g_string_new(_gString->str);
-  g_string_append(gStrTmp, chrString);
-  NOMString_assignCString(nomRetval, gStrTmp->str, NULLHANDLE);
-  g_string_free(gStrTmp, TRUE);
+  g_string_append(_gString, chrString);
 
-  return nomRetval;
+  return nomSelf;
 }
 
@@ -104 +99 @@
                                                          CORBA_Environment *ev)
 {
-  /*  NOMStringData* nomThis=NOMStringGetData(nomSelf); */
-
   return NOMString_appendCString(nomSelf, NOMString_queryCString(nomString, NULLHANDLE), NULLHANDLE);
 }
@@ -112 +105 @@
                                                           CORBA_Environment *ev)
 {
-/* NOMStringData* nomThis=NOMStringGetData(nomSelf); */
-
   return NOMString_prependCString(nomSelf, NOMString_queryCString(nomString, NULLHANDLE), NULLHANDLE);
 }
@@ -120 +111 @@
 {
   NOMStringData* nomThis=NOMStringGetData(nomSelf);
-  PNOMString nomRetval=(PNOMString)NOMString_new(nomSelf, NULLHANDLE);
-  GString* gStrTmp;
+  g_string_prepend(_gString, chrString);
 
-  gStrTmp=g_string_new(_gString->str);
-  g_string_prepend(gStrTmp, chrString);
-  NOMString_assignCString(nomRetval, gStrTmp->str, NULLHANDLE);
-  g_string_free(gStrTmp, TRUE);
-
-  return nomRetval;
+  return nomSelf;
 }
 
@@ -142 +127 @@
 {
   NOMStringData* nomThis=NOMStringGetData(nomSelf);
-  PNOMString nomRetval=(PNOMString)NOMString_new(nomSelf, NULLHANDLE);
-  GString* gStrTmp;
 
-  gStrTmp=g_string_new(_gString->str);
-  g_string_truncate(gStrTmp, ulNewLen);
-  NOMString_assignCString(nomRetval, gStrTmp->str, NULLHANDLE);
-  g_string_free(gStrTmp, TRUE);
+  g_string_truncate(_gString, ulNewLen);
 
-  return nomRetval;
+  return nomSelf;
 }