Changeset 05c0ac

Timestamp:

12/28/11 16:06:46 (17 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', '033cf796174446f5fff5bbfad1cbf1e4af35c0d8')('controller-upgrade', '72b31cc86eeeef18f1371a3067b6e8a5ca21abfc')('windows_service_fixes', 'df6bd2788365991d36d5af2a75833b8de2a5860f')

Children:

89036564232ea8feec7404f23ea17c96831701ef

Parents:

98624032674044df121f5cf446fa6d9e1e287c1d

git-author:

Micke Prag <micke.prag@telldus.se>2011-12-28 16:06:46+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2011-12-28 16:06:46+01:00

Message:

Add functions formatf() and sformatf()

Location:

telldus-core/common

Files:

• Strings.cpp (modified) (1 diff)
• Strings.h (modified) (1 diff)

telldus-core/common/Strings.cpp

@@ -159 +159 @@
 #endif
 }
+
+std::string TelldusCore::formatf(const char *format, ...) {
+        va_list ap;
+        va_start(ap, format);
+        std::string retval = sformatf(format, ap);
+        va_end(ap);
+        return retval;
+}
+
+std::string TelldusCore::sformatf(const char *format, va_list ap) {
+        //This code is based on code from the Linux man-pages project (man vsprintf)
+        int n;
+        int size = 100;     /* Guess we need no more than 100 bytes. */
+        char *p, *np;
+
+        if ((p = (char*)malloc(size)) == NULL) {
+                return "";
+        }
+
+        while (1) {
+                /* Try to print in the allocated space. */
+                n = vsnprintf(p, size, format, ap);
+
+                /* If that worked, return the string. */
+                if (n > -1 && n < size) {
+                        std::string retval(p);
+                        free(p);
+                        return retval;
+                }
+
+                /* Else try again with more space. */
+
+                if (n > -1) {   /* glibc 2.1 */
+                        size = n+1; /* precisely what is needed */
+                } else {        /* glibc 2.0 */
+                        size *= 2;  /* twice the old size */
+                }
+                if ((np = (char *)realloc (p, size)) == NULL) {
+                        free(p);
+            return "";
+                } else {
+                        p = np;
+                }
+        }
+}

telldus-core/common/Strings.h

@@ -15 +15 @@
 
         int wideToInteger(const std::wstring &input);
+
+        std::string formatf(const char *format, ...);
+        std::string sformatf(const char *format, va_list ap);
 }