commit 982463d99b56a53d6b560a12fe19ed4c7675b425
author Greg Hackmann <ghackmann@google.com> Mon Jun 24 18:05:10 2013 -0700
committer Greg Hackmann <ghackmann@google.com> Mon Jun 24 18:05:10 2013 -0700
tree e60f40cc337809f9764dd982d558037c0181f259
parent 492ce95d9f6149137cb5b63c55cf2b3cdbe51e5e

Revert "bionic: store property names as variable-length strings"

This reverts commit 492ce95d9f6149137cb5b63c55cf2b3cdbe51e5e.

libc/bionic/system_properties.c

diff --git a/libc/bionic/system_properties.c b/libc/bionic/system_properties.c
index 481e6ae..f9671c6 100644
--- a/libc/bionic/system_properties.c
+++ b/libc/bionic/system_properties.c
@@ -66,9 +66,9 @@
 typedef struct prop_area prop_area;
 
 struct prop_info {
+    char name[PROP_NAME_MAX];
     unsigned volatile serial;
     char value[PROP_VALUE_MAX];
-    char name[0];
 };
 
 typedef struct prop_info prop_info;
@@ -92,6 +92,7 @@
 
 typedef volatile uint32_t prop_off_t;
 struct prop_bt {
+    char name[PROP_NAME_MAX];
     uint8_t namelen;
     uint8_t reserved[3];
 
@@ -101,8 +102,6 @@
     prop_off_t right;
 
     prop_off_t children;
-
-    char name[0];
 };
 
 typedef struct prop_bt prop_bt;
@@ -278,7 +277,7 @@
 static prop_bt *new_prop_bt(const char *name, uint8_t namelen, prop_off_t *off)
 {
     prop_off_t off_tmp;
-    prop_bt *bt = new_prop_obj(sizeof(prop_bt) + namelen + 1, &off_tmp);
+    prop_bt *bt = new_prop_obj(sizeof(prop_bt), &off_tmp);
     if (bt) {
         memcpy(bt->name, name, namelen);
         bt->name[namelen] = '\0';
@@ -294,7 +293,7 @@
         const char *value, uint8_t valuelen, prop_off_t *off)
 {
     prop_off_t off_tmp;
-    prop_info *info = new_prop_obj(sizeof(prop_info) + namelen + 1, &off_tmp);
+    prop_info *info = new_prop_obj(sizeof(prop_info), &off_tmp);
     if (info) {
         memcpy(info->name, name, namelen);
         info->name[namelen] = '\0';