Changeset 2759 for trunk/tools/common

Timestamp:

Feb 11, 2000, 7:35:55 PM (26 years ago)

Author:

bird

Message:

Odin32 DB.

Location:

trunk/tools/common

Files:

• kFileDef.cpp (modified) (3 diffs)
• makefile.icc (modified) (2 diffs)

trunk/tools/common/kFileDef.cpp

@@ -28 +28 @@
 static char *dupeString(const char *psz);
 static char *trim(char *psz);
-
+static char *removeFnutts(char *pszStr);
 
 /**
@@ -301 +301 @@
                 }
 
+                removeFnutts((**ppe).pszIntName);
+                removeFnutts((**ppe).pszName);
                 ppe = &(**ppe).pNext;
             }
@@ -494 +496 @@
 
 
+/**
+ * Removes '"' and ''' at start and end of the string.
+ * @returns     pszStr!
+ * @param       pszStr  String that is to have "s and 's removed.
+ */
+static char *removeFnutts(char *pszStr)
+{
+    if (pszStr != NULL)
+    {
+        int cch = strlen(pszStr);
+        if (cch > 0 && (pszStr[cch-1] == '"' || pszStr[cch-1] == '\''))
+            pszStr[cch-1] = '\0';
+
+        if (*pszStr == '"' || *pszStr == '\'')
+            memmove(pszStr, pszStr+1, cch-1);
+    }
+    return pszStr;
+}

trunk/tools/common/makefile.icc

@@ -1 @@
-# $Id: makefile.icc,v 1.4 2000-02-09 23:50:51 bird Exp $
+# $Id: makefile.icc,v 1.5 2000-02-11 18:35:53 bird Exp $
 
 #
@@ -25 +25 @@
 commonicc.lib: kFilePe.obj kFileDef.obj
     -$(RM) $@
-    $(AR) $@ +kFilePe.obj +kFileDef.obj, NUL
+    $(AR) $@ -+kFilePe.obj -+kFileDef.obj, NUL;