Changeset 4642 for pjproject

Timestamp:

Nov 6, 2013 7:41:40 AM (10 years ago)

Author:

bennylp

Message:

Re #1519: added pj_strtof() to convert string to float in PJLIB, as part of pjsua2 persistent API development

Location:

pjproject/branches/projects/pjsua2/pjlib

Files:

• include/pj/string.h (modified) (1 diff)
• src/pj/string.c (modified) (1 diff)

pjproject/branches/projects/pjsua2/pjlib/include/pj/string.h

@@ -576 +576 @@
 
 /**
+ * Convert string to float.
+ *
+ * @param str   the string.
+ *
+ * @return the value.
+ */
+PJ_DECL(float) pj_strtof(const pj_str_t *str);
+
+/**
  * Utility to convert unsigned integer to string. Note that the
  * string will be NULL terminated.

pjproject/branches/projects/pjsua2/pjlib/src/pj/string.c

@@ -176 +176 @@
 }
 
+PJ_DEF(float) pj_strtof(const pj_str_t *str)
+{
+    pj_str_t part;
+    char *pdot;
+    float val;
+
+    if (str->slen == 0)
+        return 0;
+
+    pdot = (char*)pj_memchr(str->ptr, '.', str->slen);
+    part.ptr = str->ptr;
+    part.slen = pdot ? pdot - str->ptr : str->slen;
+
+    if (part.slen)
+        val = pj_strtol(&part);
+    else
+        val = 0;
+
+    if (pdot) {
+        part.ptr = pdot + 1;
+        part.slen = (str->ptr + str->slen - pdot - 1);
+        if (part.slen) {
+            pj_str_t endptr;
+            float fpart, fdiv;
+            unsigned i;
+            fpart = pj_strtoul2(&part, &endptr, 10);
+            fdiv = 1.0;
+            for (i=0; i<(part.slen - endptr.slen); ++i)
+                    fdiv = fdiv * 10;
+            if (val >= 0)
+                val += (fpart / fdiv);
+            else
+                val -= (fpart / fdiv);
+        }
+    }
+    return val;
+}
+
 PJ_DEF(int) pj_utoa(unsigned long val, char *buf)
 {