Moved the util string functions to one place.

Added Util_StrSep - same functionality as strsep.
Renamed CCTK_StrDup as Util_Strdup.

Tom


git-svn-id: http://svn.cactuscode.org/flesh/trunk@1621 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 0 insertions, 89 deletions

diff --git a/src/util/Misc.c b/src/util/Misc.c
index 2581b7ff..261d2a17 100644
--- a/src/util/Misc.c
+++ b/src/util/Misc.c
@@ -38,95 +38,6 @@ int CCTK_RegexMatch(const char *string,
                     const int nmatch,
                     regmatch_t *pmatch); 
 
- /*@@
-   @routine    Util_SplitString
-   @date       Wed Jan 20 10:14:00 1999
-   @author     Tom Goodale
-   @desc 
-   Splits a string into two parts at the given seperator.
-   Assigns memory for the two resulting strings, so this should be freed 
-   when no longer needed.
-   @enddesc 
-   @calls     
-   @calledby   
-   @history 
- 
-   @endhistory 
-
-@@*/
-int Util_SplitString(char **before, char **after, const char *string, const char *sep)
-{
-  int retval=0;
-  char *position;
-
-  /* Find location of the seperator */
-  position = strstr(string, sep);
-
-  if(position)
-  {
-    /*Allocate memory for return strings. */
-    *before = (char *)malloc((size_t)((position-string+1)*sizeof(char)));
-    *after  = (char *)malloc((size_t)((strlen(string)-(position-string)-strlen(sep)+1)*sizeof(char)));
-
-    /* Check that the allocation succeeded. */
-    if(!*before || !*after)
-    {
-      free(*before);
-      *before = NULL;
-      free(*after);
-      *after = NULL;
-      retval = 2;
-    }
-    else
-    {
-      retval = 3;
-    }
-  }
-  else
-  {
-    *before = NULL;
-    *after = NULL;
-    retval = 1;
-  }
-
-  if(position && *before && *after)
-  {
-    /* Copy the data */
-    strncpy(*before, string, (int)(position-string));
-    (*before)[(int)(position-string)] = '\0';
-  
-    strncpy(*after, position+strlen(sep), strlen(string)-(int)(position-string)-strlen(sep));
-    (*after)[strlen(string)-(position-string)-strlen(sep)] = '\0';
-    
-    retval = 0;
-  }
-
-  return retval;
-}
-
- /*@@
-   @routine    CCTK_Strdup
-   @date       Thu Mar 28 11:20:27 2000
-   @author     Gerd Lanfermann
-   @desc 
-   CCTK version of strdup, since it's not guaranteed to be there.
-   @enddesc 
-   @calls     
-   @calledby   
-   @history 
- 
-   @endhistory 
-
-@@*/
-char *CCTK_Strdup(const char *s) 
-{
-  char *retstr;
-  
-  retstr = (char*) malloc((strlen(s)+1)*sizeof(char));
-  sprintf(retstr,"%s",s);
-
-  return(retstr);
-}
 
  /*@@
    @routine    CCTK_Equals