Changeset 1997 in kBuild

Timestamp:

Oct 29, 2008 9:31:35 PM (16 years ago)

Author:

bird

Message:

variaiable::value_alloc_len -> unsigned int.

Location:

trunk/src/kmk

Files:

• function.c (modified) (2 diffs)
• variable.c (modified) (6 diffs)
• variable.h (modified) (2 diffs)

trunk/src/kmk/function.c

@@ -1040 +1040 @@
       free (result);
 #else  /* CONFIG_WITH_VALUE_LENGTH */
-      if (len >= (unsigned int)var->value_alloc_len)
+      if (len >= var->value_alloc_len)
         {
 # ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
@@ -1048 +1048 @@
 # endif
             free (var->value);
-          var->value_alloc_len = (len + 32) & ~31;
+          var->value_alloc_len = VAR_ALIGN_VALUE_ALLOC (len + 1);
           var->value = xmalloc (var->value_alloc_len);
         }

trunk/src/kmk/variable.c

@@ -260 +260 @@
                   free (v->value);
               v->rdonly_val = duplicate_value == -1;
-              v->value = (char *)value;
+              v->value = (char *) value;
               v->value_alloc_len = 0;
 # else
               if (v->value != 0)
                 free (v->value);
-              v->value = (char *)value;
+              v->value = (char *) value;
               v->value_alloc_len = value_len + 1;
 # endif
@@ -271 +271 @@
           else
             {
-              if ((unsigned int)v->value_alloc_len <= value_len)
+              if (v->value_alloc_len <= value_len)
                 {
 # ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
@@ -279 +279 @@
 # endif
                     free (v->value);
-                  v->value_alloc_len = (value_len + 0x40) & ~0x3f;
+                  v->value_alloc_len = VAR_ALIGN_VALUE_ALLOC (value_len + 1);
                   v->value = xmalloc (v->value_alloc_len);
                 }
@@ -333 +333 @@
       v->rdonly_val = 0;
 # endif
-      v->value_alloc_len = (value_len + 32) & ~31;
+      v->value_alloc_len = VAR_ALIGN_VALUE_ALLOC (value_len + 1);
       v->value = xmalloc (v->value_alloc_len);
       memcpy (v->value, value, value_len + 1);
     }
-#else
+#else  /* !CONFIG_WITH_VALUE_LENGTH */
   v->value = xstrdup (value);
-#endif
+#endif /* !CONFIG_WITH_VALUE_LENGTH */
   if (flocp != 0)
     v->fileinfo = *flocp;
@@ -1632 +1632 @@
 
   /* adjust the size. */
-  if ((unsigned)v->value_alloc_len <= new_value_len + 1)
+  if (v->value_alloc_len <= new_value_len + 1)
     {
       v->value_alloc_len *= 2;
-      if ((unsigned)v->value_alloc_len < new_value_len + 1)
-          v->value_alloc_len = (new_value_len + 1 + value_len + 0x7f) + ~0x7fU;
+      if (v->value_alloc_len < new_value_len + 1)
+          v->value_alloc_len = VAR_ALIGN_VALUE_ALLOC (new_value_len + 1 + value_len + 1);
 # ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
       if ((append || !v->value_length) && !v->rdonly_val)
@@ -2188 +2188 @@
   v->value = p;
 #ifdef CONFIG_WITH_VALUE_LENGTH
-  v->value_alloc_len = -1;
+  v->value_alloc_len = ~(unsigned int)0;
   v->value_length = eos != NULL ? eos - p : -1;
   assert (eos == NULL || strchr (p, '\0') == eos);

trunk/src/kmk/variable.h

@@ -54 +54 @@
 #define EXP_COUNT_BITS  15      /* This gets all the bitfields into 32 bits */
 #define EXP_COUNT_MAX   ((1<<EXP_COUNT_BITS)-1)
+#ifdef CONFIG_WITH_VALUE_LENGTH
+#define VAR_ALIGN_VALUE_ALLOC(len)  ( ((len) + (unsigned int)31) & ~(unsigned int)31 )
+#endif
 
 struct variable
@@ -65 +68 @@
 #ifdef CONFIG_WITH_VALUE_LENGTH
     int value_length;           /* The length of the value, usually unused.  */
-    int value_alloc_len;        /* The amount of memory we've actually allocated. */
+    unsigned int value_alloc_len; /* The amount of memory we've actually allocated. */
     /* FIXME: make lengths unsigned! */
 #endif