Changeset 62

Timestamp:

Nov 20, 2005 7:55:42 PM (18 years ago)

Author:

bennylp

Message:

Added hex character conversion utility in ctype

Location:

pjproject/trunk/pjlib

Files:

• build/pjlib.dsp (modified) (2 diffs)
• include/pj/compat/string.h (modified) (2 diffs)
• include/pj/ctype.h (modified) (3 diffs)
• include/pj/errno.h (modified) (4 diffs)
• include/pj/log.h (modified) (2 diffs)
• include/pj/string.h (modified) (2 diffs)
• include/pj/string_i.h (modified) (10 diffs)
• src/pj/ctype.c (added)
• src/pj/log.c (modified) (1 diff)
• src/pj/os_core_win32.c (modified) (2 diffs)
• src/pj/string.c (modified) (4 diffs)

pjproject/trunk/pjlib/build/pjlib.dsp

@@ -179 +179 @@
 # Begin Source File
 
+SOURCE=..\src\pj\ctype.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\pj\equeue_winnt.c
 # End Source File
@@ -235 +239 @@
 
 SOURCE=..\src\pj\ioqueue_winnt.c
-
-!IF  "$(CFG)" == "pjlib - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "pjlib - Win32 Debug"
-
-!ENDIF 
-
 # End Source File
 # Begin Source File

pjproject/trunk/pjlib/include/pj/compat/string.h

@@ -45 +45 @@
 
 #define pj_native_strcmp        strcmp
+#define pj_native_strncmp       strncmp
 #define pj_native_strlen        strlen
 #define pj_native_strcpy        strcpy
@@ -50 +51 @@
 #define pj_native_strchr        strchr
 #define pj_native_strcasecmp    strcasecmp
+#define pj_native_stricmp       strcasecmp
 #define pj_native_strncasecmp   strncasecmp
-
+#define pj_native_strnicmp      strncasecmp
 
 #endif  /* __PJ_COMPAT_STRING_H__ */

pjproject/trunk/pjlib/include/pj/ctype.h

@@ -25 +25 @@
  */
 
+#include <pj/types.h>
 #include <pj/compat/ctype.h>
+
+PJ_BEGIN_DECL
 
 /**
@@ -100 +103 @@
 
 /**
- * Returns a non-zero value if c is a particular representation of 
- * an hexadecimal digit character.
- * @param c     The integer character to test.
- * @return      Non-zero value if c is a particular representation of 
- *              an hexadecimal digit character.
- */
-PJ_INLINE(int) pj_isxdigit(int c){ return isxdigit(c); }
-
-/**
  * Returns a non-zero value if c is a either a space (' ') or horizontal
  * tab ('\\t') character.
@@ -131 +125 @@
 PJ_INLINE(int) pj_toupper(int c) { return toupper(c); }
 
+/**
+ * Returns a non-zero value if c is a particular representation of 
+ * an hexadecimal digit character.
+ * @param c     The integer character to test.
+ * @return      Non-zero value if c is a particular representation of 
+ *              an hexadecimal digit character.
+ */
+PJ_INLINE(int) pj_isxdigit(int c){ return isxdigit(c); }
+
+/**
+ * Array of hex digits, in lowerspace.
+ */
+extern char pj_hex_digits[];
+
+/**
+ * Convert a value to hex representation.
+ * @param value     Integral value to convert.
+ * @param p         Buffer to hold the hex representation, which must be
+ *                  at least two bytes length.
+ */
+PJ_INLINE(void) pj_val_to_hex_digit(unsigned value, char *p)
+{
+    *p++ = pj_hex_digits[ (value & 0xF0) >> 4 ];
+    *p   = pj_hex_digits[ (value & 0x0F) ];
+}
+
+/**
+ * Convert hex digit c to integral value.
+ * @param c     The hex digit character.
+ * @return      The integral value between 0 and 15.
+ */
+PJ_INLINE(unsigned) pj_hex_digit_to_val(unsigned c)
+{
+    if (c <= '9')
+        return (c-'0') & 0x0F;
+    else if (c <= 'F')
+        return  (c-'A'+10) & 0x0F;
+    else
+        return (c-'a'+10) & 0x0F;
+}
+
 /** @} */
+
+PJ_END_DECL
 
 #endif  /* __PJ_CTYPE_H__ */

pjproject/trunk/pjlib/include/pj/errno.h

@@ -165 +165 @@
  * Unknown error has been reported.
  */
-#define PJ_EUNKNOWN         (PJ_ERRNO_START_STATUS + 1)
+#define PJ_EUNKNOWN         (PJ_ERRNO_START_STATUS + 1) /* 70001 */
 /**
  * @hideinitializer
  * The operation is pending and will be completed later.
  */
-#define PJ_EPENDING         (PJ_ERRNO_START_STATUS + 2)
+#define PJ_EPENDING         (PJ_ERRNO_START_STATUS + 2) /* 70002 */
 /**
  * @hideinitializer
  * Too many connecting sockets.
  */
-#define PJ_ETOOMANYCONN     (PJ_ERRNO_START_STATUS + 3)
+#define PJ_ETOOMANYCONN     (PJ_ERRNO_START_STATUS + 3) /* 70003 */
 /**
  * @hideinitializer
  * Invalid argument.
  */
-#define PJ_EINVAL           (PJ_ERRNO_START_STATUS + 4)
+#define PJ_EINVAL           (PJ_ERRNO_START_STATUS + 4) /* 70004 */
 /**
  * @hideinitializer
  * Name too long (eg. hostname too long).
  */
-#define PJ_ENAMETOOLONG     (PJ_ERRNO_START_STATUS + 5)
+#define PJ_ENAMETOOLONG     (PJ_ERRNO_START_STATUS + 5) /* 70005 */
 /**
  * @hideinitializer
  * Not found.
  */
-#define PJ_ENOTFOUND        (PJ_ERRNO_START_STATUS + 6)
+#define PJ_ENOTFOUND        (PJ_ERRNO_START_STATUS + 6) /* 70006 */
 /**
  * @hideinitializer
  * Not enough memory.
  */
-#define PJ_ENOMEM           (PJ_ERRNO_START_STATUS + 7)
+#define PJ_ENOMEM           (PJ_ERRNO_START_STATUS + 7) /* 70007 */
 /**
  * @hideinitializer
  * Bug detected!
  */
-#define PJ_EBUG             (PJ_ERRNO_START_STATUS + 8)
+#define PJ_EBUG             (PJ_ERRNO_START_STATUS + 8) /* 70008 */
 /**
  * @hideinitializer
  * Operation timed out.
  */
-#define PJ_ETIMEDOUT        (PJ_ERRNO_START_STATUS + 9)
+#define PJ_ETIMEDOUT        (PJ_ERRNO_START_STATUS + 9) /* 70009 */
 /**
  * @hideinitializer
  * Too many objects.
  */
-#define PJ_ETOOMANY         (PJ_ERRNO_START_STATUS + 10)
+#define PJ_ETOOMANY         (PJ_ERRNO_START_STATUS + 10)/* 70010 */
 /**
  * @hideinitializer
  * Object is busy.
  */
-#define PJ_EBUSY            (PJ_ERRNO_START_STATUS + 11)
+#define PJ_EBUSY            (PJ_ERRNO_START_STATUS + 11)/* 70011 */
 /**
  * @hideinitializer
  * The specified option is not supported.
  */
-#define PJ_ENOTSUP          (PJ_ERRNO_START_STATUS + 12)
+#define PJ_ENOTSUP          (PJ_ERRNO_START_STATUS + 12)/* 70012 */
 /**
  * @hideinitializer
  * Invalid operation.
  */
-#define PJ_EINVALIDOP       (PJ_ERRNO_START_STATUS + 13)
+#define PJ_EINVALIDOP       (PJ_ERRNO_START_STATUS + 13)/* 70013 */
 /**
  * @hideinitializer
  * Operation is cancelled.
  */
-#define PJ_ECANCELLED       (PJ_ERRNO_START_STATUS + 14)
+#define PJ_ECANCELLED       (PJ_ERRNO_START_STATUS + 14)/* 70014 */
 /**
  * @hideinitializer
  * Object already exists.
  */
-#define PJ_EEXISTS          (PJ_ERRNO_START_STATUS + 14)
+#define PJ_EEXISTS          (PJ_ERRNO_START_STATUS + 15)/* 70015 */
 
 /** @} */   /* pj_errnum */
@@ -255 +255 @@
 /**
  * PJ_ERRNO_START_STATUS is where PJLIB specific status codes start.
+ * Effectively the error in this class would be 70000 - 119000.
  */
 #define PJ_ERRNO_START_STATUS   (PJ_ERRNO_START + PJ_ERRNO_SPACE_SIZE)
@@ -261 +262 @@
  * PJ_ERRNO_START_SYS converts platform specific error codes into
  * pj_status_t values.
+ * Effectively the error in this class would be 120000 - 169000.
  */
 #define PJ_ERRNO_START_SYS      (PJ_ERRNO_START_STATUS + PJ_ERRNO_SPACE_SIZE)
@@ -267 +269 @@
  * PJ_ERRNO_START_USER are reserved for applications that use error
  * codes along with PJLIB codes.
+ * Effectively the error in this class would be 170000 - 219000.
  */
 #define PJ_ERRNO_START_USER     (PJ_ERRNO_START_SYS + PJ_ERRNO_SPACE_SIZE)

pjproject/trunk/pjlib/include/pj/log.h

@@ -26 +26 @@
 
 #include <pj/types.h>
-
+#include <stdarg.h>
 
 PJ_BEGIN_DECL
@@ -125 +125 @@
 
 /**
+ * Write to log.
+ *
+ * @param sender    Source of the message.
+ * @param level     Verbosity level.
+ * @param format    Format.
+ * @param marker    Marker.
+ */
+PJ_DECL(void) pj_log(const char *sender, int level, 
+                     const char *format, va_list marker);
+
+/**
  * Change log output function. The front-end logging functions will call
  * this function to write the actual message to the desired device. 

pjproject/trunk/pjlib/include/pj/string.h

@@ -175 +175 @@
 
 /**
+ * Copy source string to destination up to the specified max length.
+ *
+ * @param dst       The target string.
+ * @param src       The source string.
+ * @param max       Maximum characters to copy.
+ *
+ * @return the target string.
+ */
+PJ_IDECL(pj_str_t*) pj_strncpy(pj_str_t *dst, const pj_str_t *src, 
+                               pj_ssize_t max);
+
+/**
+ * Copy source string to destination up to the specified max length,
+ * and NULL terminate the destination. If source string length is
+ * greater than or equal to max, then max-1 will be copied.
+ *
+ * @param dst       The target string.
+ * @param src       The source string.
+ * @param max       Maximum characters to copy.
+ *
+ * @return the target string.
+ */
+PJ_IDECL(pj_str_t*) pj_strncpy_with_null(pj_str_t *dst, const pj_str_t *src,
+                                         pj_ssize_t max);
+
+/**
  * Duplicate string.
  *
@@ -521 +547 @@
 }
 
+
 /**
  * @}

pjproject/trunk/pjlib/include/pj/string_i.h

@@ -22 +22 @@
     pj_str_t dst;
     dst.ptr = str;
-    dst.slen = str ? strlen(str) : 0;
+    dst.slen = str ? pj_native_strlen(str) : 0;
     return dst;
 }
@@ -57 +57 @@
                               const char *src)
 {
-    dst->slen = src ? strlen(src) : 0;
+    dst->slen = src ? pj_native_strlen(src) : 0;
     if (dst->slen) {
         dst->ptr = (char*)pj_pool_alloc(pool, dst->slen);
@@ -92 +92 @@
 PJ_IDEF(pj_str_t*) pj_strcpy2(pj_str_t *dst, const char *src)
 {
-    dst->slen = src ? strlen(src) : 0;
+    dst->slen = src ? pj_native_strlen(src) : 0;
     if (dst->slen > 0)
         pj_memcpy(dst->ptr, src, dst->slen);
     return dst;
 }
+
+PJ_IDEF(pj_str_t*) pj_strncpy( pj_str_t *dst, const pj_str_t *src, 
+                               pj_ssize_t max)
+{
+    if (max > src->slen) max = src->slen;
+    pj_memcpy(dst->ptr, src->ptr, max);
+    dst->slen = max;
+    return dst;
+}
+
+PJ_IDEF(pj_str_t*) pj_strncpy_with_null( pj_str_t *dst, const pj_str_t *src,
+                                         pj_ssize_t max)
+{
+    if (max <= src->slen)
+        max = max-1;
+    else
+        max = src->slen;
+
+    pj_memcpy(dst->ptr, src->ptr, max);
+    dst->ptr[max] = '\0';
+    dst->slen = max;
+    return dst;
+}
+
 
 PJ_IDEF(int) pj_strcmp( const pj_str_t *str1, const pj_str_t *str2)
@@ -105 +129 @@
     if (diff) {
         return (int)diff;
-    } else if (str1->ptr) {
-        return strncmp(str1->ptr, str2->ptr, str1->slen);
+    } else if (str1->ptr && str1->slen) {
+        return pj_native_strncmp(str1->ptr, str2->ptr, str1->slen);
     } else {
         return 0;
@@ -115 +139 @@
                          pj_size_t len)
 {
-    return (str1->ptr && str2->ptr) ? strncmp(str1->ptr, str2->ptr, len) :
-           (str1->ptr == str2->ptr ? 0 : 1);
+    return (str1->ptr && str2->ptr) ? 
+            pj_native_strncmp(str1->ptr, str2->ptr, len) :
+            (str1->ptr == str2->ptr ? 0 : 1);
 }
 
@@ -122 +147 @@
                           pj_size_t len)
 {
-    return (str1->ptr && str2) ? strncmp(str1->ptr, str2, len) :
+    return (str1->ptr && str2) ? pj_native_strncmp(str1->ptr, str2, len) :
            (str1->ptr==str2 ? 0 : 1);
 }
@@ -139 +164 @@
         return (int)diff;
     } else {
-        return strnicmp(str1->ptr, str2->ptr, str1->slen);
+        return pj_native_strnicmp(str1->ptr, str2->ptr, str1->slen);
     }
 }
@@ -145 +170 @@
 PJ_IDEF(int) pj_stricmp2( const pj_str_t *str1, const char *str2)
 {
-    return (str1->ptr && str2) ? strnicmp(str1->ptr, str2, str1->slen) :
-           (str1->ptr==str2 ? 0 : 1);
+    return (str1->ptr && str2) ? 
+            pj_native_strnicmp(str1->ptr, str2, str1->slen) :
+            (str1->ptr==str2 ? 0 : 1);
 }
 
@@ -152 +178 @@
                           pj_size_t len)
 {
-    return (str1->ptr && str2->ptr) ? strnicmp(str1->ptr, str2->ptr, len) :
-           (str1->ptr == str2->ptr ? 0 : 1);
+    return (str1->ptr && str2->ptr) ? 
+            pj_native_strnicmp(str1->ptr, str2->ptr, len) :
+            (str1->ptr == str2->ptr ? 0 : 1);
 }
 
@@ -159 +186 @@
                            pj_size_t len)
 {
-    return (str1->ptr && str2) ? strnicmp(str1->ptr, str2, len) :
-           (str1->ptr == str2 ? 0 : 1);
+    return (str1->ptr && str2) ? 
+            pj_native_strnicmp(str1->ptr, str2, len) :
+            (str1->ptr == str2 ? 0 : 1);
 }
 

pjproject/trunk/pjlib/src/pj/log.c

@@ -65 +65 @@
 }
 
-static void pj_log(const char *sender, int level, 
-                   const char *format, va_list marker)
+PJ_DEF(void) pj_log( const char *sender, int level, 
+                     const char *format, va_list marker)
 {
     pj_time_val now;

pjproject/trunk/pjlib/src/pj/os_core_win32.c

@@ -130 +130 @@
     pj_status_t rc;
 
-    PJ_LOG(5, ("pj_init", "Initializing PJ Library.."));
-
     /* Init Winsock.. */
     if (WSAStartup(MAKEWORD(2,0), &wsa) != 0) {
-        PJ_LOG(1, ("pj_init", "Winsock initialization has returned an error"));
         return PJ_RETURN_OS_ERROR(WSAGetLastError());
     }
@@ -140 +137 @@
     /* Init this thread's TLS. */
     if ((rc=pj_thread_init()) != PJ_SUCCESS) {
-        PJ_LOG(1, ("pj_init", "Thread initialization has returned an error"));
         return rc;
     }

pjproject/trunk/pjlib/src/pj/string.c

@@ -28 +28 @@
 
 
-static char hex[] = {'0', '1', '2', '3', '4', '5', '6', '7',
-                     '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-
 PJ_DEF(pj_str_t*) pj_strltrim( pj_str_t *str )
 {
@@ -51 +48 @@
 }
 
-PJ_INLINE(void) pj_val_to_hex_digit(unsigned value, char *p)
-{
-    *p++ = hex[ (value & 0xF0) >> 4 ];
-    *p++ = hex[ (value & 0x0F) ];
-}
-
 PJ_DEF(char*) pj_create_random_string(char *str, pj_size_t len)
 {
@@ -73 +64 @@
     }
     for (i=i * 8; i<len; ++i) {
-        *p++ = hex[ pj_rand() & 0x0F ];
+        *p++ = pj_hex_digits[ pj_rand() & 0x0F ];
     }
     return str;
@@ -130 +121 @@
 }
 
+