New upstream version 3.0.3upstream/3.0.3

1 files changed, 0 insertions, 142 deletions

diff --git a/StringUtils.c b/StringUtils.c
deleted file mode 100644
index e2386e3..0000000
--- a/StringUtils.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-htop - StringUtils.c
-(C) 2004-2011 Hisham H. Muhammad
-Released under the GNU GPL, see the COPYING file
-in the source distribution for its full text.
-*/
-
-#include "StringUtils.h"
-#include "XAlloc.h"
-
-#include "config.h"
-
-#include <string.h>
-#include <strings.h>
-#include <stdlib.h>
-
-char* String_cat(const char* s1, const char* s2) {
-   int l1 = strlen(s1);
-   int l2 = strlen(s2);
-   char* out = xMalloc(l1 + l2 + 1);
-   memcpy(out, s1, l1);
-   memcpy(out+l1, s2, l2+1);
-   out[l1 + l2] = '\0';
-   return out;
-}
-
-char* String_trim(const char* in) {
-   while (in[0] == ' ' || in[0] == '\t' || in[0] == '\n') {
-      in++;
-   }
-   int len = strlen(in);
-   while (len > 0 && (in[len-1] == ' ' || in[len-1] == '\t' || in[len-1] == '\n')) {
-      len--;
-   }
-   char* out = xMalloc(len+1);
-   strncpy(out, in, len);
-   out[len] = '\0';
-   return out;
-}
-
-inline int String_eq(const char* s1, const char* s2) {
-   if (s1 == NULL || s2 == NULL) {
-      if (s1 == NULL && s2 == NULL)
-         return 1;
-      else
-         return 0;
-   }
-   return (strcmp(s1, s2) == 0);
-}
-
-char** String_split(const char* s, char sep, int* n) {
-   *n = 0;
-   const int rate = 10;
-   char** out = xCalloc(rate, sizeof(char*));
-   int ctr = 0;
-   int blocks = rate;
-   char* where;
-   while ((where = strchr(s, sep)) != NULL) {
-      int size = where - s;
-      char* token = xMalloc(size + 1);
-      strncpy(token, s, size);
-      token[size] = '\0';
-      out[ctr] = token;
-      ctr++;
-      if (ctr == blocks) {
-         blocks += rate;
-         out = (char**) xRealloc(out, sizeof(char*) * blocks);
-      }
-      s += size + 1;
-   }
-   if (s[0] != '\0') {
-      out[ctr] = xStrdup(s);
-      ctr++;
-   }
-   out = xRealloc(out, sizeof(char*) * (ctr + 1));
-   out[ctr] = NULL;
-   *n = ctr;
-   return out;
-}
-
-void String_freeArray(char** s) {
-   if (!s) {
-      return;
-   }
-   for (int i = 0; s[i] != NULL; i++) {
-      free(s[i]);
-   }
-   free(s);
-}
-
-char* String_getToken(const char* line, const unsigned short int numMatch) {
-   const unsigned short int len = strlen(line);
-   char inWord = 0;
-   unsigned short int count = 0;
-   char match[50];
-
-   unsigned short int foundCount = 0;
-
-   for (unsigned short int i = 0; i < len; i++) {
-      char lastState = inWord;
-      inWord = line[i] == ' ' ? 0:1;
-
-      if (lastState == 0 && inWord == 1)
-         count++;
-
-      if(inWord == 1){
-         if (count == numMatch && line[i] != ' ' && line[i] != '\0' && line[i] != '\n' && line[i] != (char)EOF) {
-            match[foundCount] = line[i];
-            foundCount++;
-         }
-      }
-   }
-
-   match[foundCount] = '\0';
-   return((char*)xStrdup(match));
-}
-
-char* String_readLine(FILE* fd) {
-   const int step = 1024;
-   int bufSize = step;
-   char* buffer = xMalloc(step + 1);
-   char* at = buffer;
-   for (;;) {
-      char* ok = fgets(at, step + 1, fd);
-      if (!ok) {
-         free(buffer);
-         return NULL;
-      }
-      char* newLine = strrchr(at, '\n');
-      if (newLine) {
-         *newLine = '\0';
-         return buffer;
-      } else {
-         if (feof(fd)) {
-            return buffer;
-         }
-      }
-      bufSize += step;
-      buffer = xRealloc(buffer, bufSize + 1);
-      at = buffer + bufSize - step;
-   }
-}