Changeset 3573 for trunk/kStuff/kHlp/Bare/kHlpBareStr.c

Timestamp:

Aug 31, 2007, 6:09:23 AM (18 years ago)

Author:

bird

Message:

kHlp work...

Location:

trunk/kStuff/kHlp/Bare

Files:

• . (added)
• kHlpBareStr.c (moved) (moved from trunk/kStuff/kLdr/kLdrHlpStr.c ) (7 diffs)

trunk/kStuff/kHlp/Bare/kHlpBareStr.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
+ * kHlpBare - String Manipulation.
+ */
+
+/*
+ * Copyright (c) 2006-2007 knut st. osmundsen <bird-src-spam@anduin.net>
  *
- * kLdr - The Dynamic Loader, String Helper Functions.
+ * This file is part of kStuff.
  *
- * Copyright (c) 2006 knut st. osmundsen <bird-kbuild-src@anduin.net>
+ * kStuff is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
+ * kStuff is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * This file is part of kLdr.
- *
- * kLdr is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * kLdr is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with kLdr; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with kStuff; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
-
 
 /*******************************************************************************
 *   Header Files                                                               *
 *******************************************************************************/
-#include <k/kLdr.h>
-#include "kLdrHlp.h"
+#include <k/kHlpString.h>
 
 
-/**
- * Converts an signed integer to an ascii string.
- *
- * @returns psz.
- * @param   psz         Pointer to the output buffer.
- * @param   cch         The size of the output buffer.
- * @param   lVal        The value.
- * @param   iBase       The base to format it. (2,8,10 or 16)
- */
-char *kldrHlpInt2Ascii(char *psz, KSIZE cch, long lVal, unsigned iBase)
-{
-    static const char s_szDigits[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-    char *pszRet = psz;
-
-    if (cch >= (lVal < 0 ? 3U : 2U) && psz)
-    {
-        /* prefix */
-        if (lVal < 0)
-        {
-            *psz++ = '-';
-            cch--;
-            lVal = -lVal;
-        }
-
-        /* the digits */
-        do
-        {
-            *psz++ = s_szDigits[lVal % iBase];
-            cch--;
-            lVal /= iBase;
-        } while (lVal && cch > 1);
-
-        /* overflow indicator */
-        if (lVal)
-            psz[-1] = '+';
-    }
-    else if (!pszRet)
-        return pszRet;
-    else if (cch < 1 || !pszRet)
-        return pszRet;
-    else
-        *psz++ = '+';
-    *psz = '\0';
-
-    return pszRet;
-}
-
-
-KSIZE  kLdrHlpStrNLen(const char *psz, KSIZE cchMax)
+KSIZE  kHlpStrNLen(const char *psz, KSIZE cchMax)
 {
     const char * const pszStart = psz;
@@ -90 +40 @@
 
 
-int     kLdrHlpMemIComp(const void *pv1, const void *pv2, KSIZE cb)
+int     kHlpMemIComp(const void *pv1, const void *pv2, KSIZE cb)
 {
     const KU8 *pb1 = (const KU8 *)pv1;
@@ -110 +60 @@
 
 
-int     kLdrHlpStrIComp(const char *pv1, const char *pv2)
+int     kHlpStrIComp(const char *pv1, const char *pv2)
 {
     const KU8 *pb1 = (const KU8 *)pv1;
@@ -132 +82 @@
 
 
-#ifdef kLdrHlpStrChr_needed
-char   *kLdrHlpStrChr(const char *psz, int ch)
+#ifdef kHlpStrChr_needed
+char   *kHlpStrChr(const char *psz, int ch)
 {
     while (*psz)
@@ -146 +96 @@
 
 
-#ifdef kLdrHlpMemChr_needed
-void   *kLdrHlpMemChr(const void *pv, int ch, KSIZE cb)
+#ifdef kHlpMemChr_needed
+void   *kHlpMemChr(const void *pv, int ch, KSIZE cb)
 {
     const KU8 *pb = (const KU8 *)pv;
@@ -162 +112 @@
 
 
-#ifdef kLdrHlpMemMove_needed
-void   *kLdrHlpMemMove(void *pv1, const void *pv2, KSIZE cb)
+#ifdef kHlpMemMove_needed
+void   *kHlpMemMove(void *pv1, const void *pv2, KSIZE cb)
 {
     KU8            *pbDst = (KU8 *)pv1;
@@ -177 +127 @@
 
 
-#ifdef kLdrHlpStrNComp_needed
-int     kLdrHlpStrNComp(const char *psz1, const char *psz2, KSIZE cch)
+#ifdef kHlpStrNComp_needed
+int     kHlpStrNComp(const char *psz1, const char *psz2, KSIZE cch)
 {
     while (cch-- > 0)