Changeset 223 for trunk

Timestamp:

04/03/11 12:21:04 (14 years ago)

Author:

tim

Message:

switched talloc_steal calls to talloc_reparent for more precision and to eliminate warnings

Location:

trunk

Files:

• lib/regfi.c (modified) (13 diffs)
• src/reglookup-recover.c (modified) (3 diffs)

trunk/lib/regfi.c

@@ -1368 +1368 @@
         }
       }
-      talloc_steal(nk, nk->values);
+      talloc_reparent(NULL, nk, nk->values);
     }
   }
@@ -1398 +1398 @@
         nk->num_subkeys = 0;
       }
-      talloc_steal(nk, nk->subkeys);
+      talloc_reparent(NULL, nk, nk->subkeys);
     }
   }
@@ -1528 +1528 @@
 
   /* In this case, we want file_cb to be freed when ret_val is */
-  talloc_steal(ret_val, file_cb);
+  talloc_reparent(NULL, ret_val, file_cb);
   return ret_val;
 
@@ -1539 +1539 @@
 /******************************************************************************
  ******************************************************************************/
-int regfi_free_cb(void* f)
+static int regfi_free_cb(void* f)
 {
   REGFI_FILE* file = (REGFI_FILE*)f;
@@ -1616 +1616 @@
     goto fail;
   }
-  talloc_steal(rb, rb->hbins);
+  talloc_reparent(NULL, rb, rb->hbins);
 
   rla = true;
@@ -1625 +1625 @@
     rla = range_list_add(rb->hbins, hbin->file_off, hbin->block_size, hbin);
     if(rla)
-      talloc_steal(rb->hbins, hbin);
+      talloc_reparent(NULL, rb->hbins, hbin);
 
     hbin_off = hbin->file_off + hbin->block_size;
@@ -1794 +1794 @@
     return NULL;
   }
-  talloc_steal(ret_val, ret_val->key_positions);
+  talloc_reparent(NULL, ret_val, ret_val->key_positions);
 
   ret_val->f = file;
@@ -1928 +1928 @@
 const REGFI_NK* regfi_iterator_cur_key(REGFI_ITERATOR* i)
 {
-  talloc_reference(NULL, i->cur_key);
-  return i->cur_key;
+  return talloc_reference(NULL, i->cur_key);
 }
 
@@ -2056 +2055 @@
   ret_val->raw = raw;
   ret_val->size = parse_length;
-  talloc_steal(ret_val, raw);
+  talloc_reparent(NULL, ret_val, raw);
 
   interpreted = talloc_array(NULL, char, parse_length);
@@ -2074 +2073 @@
   else
   {
+    /* XXX: check for NULL return here? */
     interpreted = talloc_realloc(NULL, interpreted, char, conv_size);
     ret_val->interpreted = interpreted;
-    talloc_steal(ret_val, interpreted);
+    talloc_reparent(NULL, ret_val, interpreted);
   }
 
@@ -2267 +2267 @@
     return NULL;
   
-  talloc_steal(ret_val, raw_data.buf);
+  talloc_reparent(NULL, ret_val, raw_data.buf);
   ret_val->raw = raw_data.buf;
   ret_val->size = raw_data.len;
@@ -2319 +2319 @@
     }
 
+    /* XXX: check for NULL */
     tmp_str = talloc_realloc(NULL, tmp_str, uint8_t, tmp_size);
     data->interpreted.string = tmp_str;
     data->interpreted_size = tmp_size;
-    talloc_steal(data, tmp_str);
+    talloc_reparent(NULL, data, tmp_str);
     break;
 
@@ -2407 +2408 @@
     /* XXX: how meaningful is this?  should we store number of strings instead? */
     data->interpreted_size = tmp_size;
-    talloc_steal(tmp_array, tmp_str);
-    talloc_steal(data, tmp_array);
+    talloc_reparent(NULL, tmp_array, tmp_str);
+    talloc_reparent(NULL, data, tmp_array);
     break;
 

trunk/src/reglookup-recover.c

@@ -573 +573 @@
        */
       vk->data = regfi_buffer_to_data(data);
-      talloc_steal(vk, vk->data);
+      talloc_reparent(NULL, vk, vk->data);
     }
   }
@@ -612 +612 @@
           goto fail;
         }
-        talloc_steal(unalloc_keys, key);
+        talloc_reparent(NULL, unalloc_keys, key);
         j+=key->cell_size-8;
       }
@@ -753 +753 @@
           return 20;
         }
-        talloc_steal(unalloc_sks, sk);
+        talloc_reparent(NULL, unalloc_sks, sk);
         j+=sk->cell_size-8;
       }