Changeset 988 for vendor/current/source3/lib/srprs.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/lib/srprs.c (modified) (3 diffs)

vendor/current/source3/lib/srprs.c

@@ -25 +25 @@
  */
 
+#include "includes.h"
 #include "srprs.h"
 #include "cbuf.h"
-#include <ctype.h>
-#include <string.h>
-#include <assert.h>
-#include <stdio.h>
 
 bool srprs_skipws(const char** ptr) {
@@ -129 +126 @@
 bool srprs_hex(const char** ptr, size_t len, unsigned* u)
 {
-        static const char* FMT[] = {
-                "%1x","%2x","%3x","%4x","%5x","%6x","%7x","%8x",
-                "%9x","%10x","%11x","%12x","%13x","%14x","%15x","%16x"
-        };
-
-        const char* pos = *ptr;
+        const char *str = *ptr;
+        const char *pos = *ptr;
         int ret;
         int i;
-
-        assert((len > 0)
-               && (len <= 2*sizeof(unsigned))
-               && (len <= sizeof(FMT)/sizeof(const char*)));
+        char buf[8+1] = {};
+
+        assert((len >= 1) && (len <= 8));
 
         for (i=0; i<len; i++) {
@@ -146 +138 @@
                         break;
                 }
-        }
-
-        ret = sscanf(*ptr, FMT[len-1], u);
+                buf[i] = str[i];
+        }
+
+        ret = sscanf(buf, "%8x", u);
 
         if ( ret != 1 ) {