Addresses #1032

Turned some nested functions (that had no free variables) into non-nested functions.

git-svn-id: file:///svn/tokudb@5320 c7de825b-a66e-492c-adef-691d508d4ae1

newbrt/brt-serialize.c

@@ -25,6 +25,13 @@ static const int brtnode_header_overhead = (8+   // magic "tokunode" or "tokulea
 					    4+   // localfingerprint
 					    4);  // crc32 at the end
 
+int addupsize (OMTVALUE lev, u_int32_t UU(idx), void *vp) {
+    LEAFENTRY le=lev;
+    unsigned int *ip=vp;
+    (*ip) += OMT_ITEM_OVERHEAD + leafentry_disksize(le);
+    return 0;
+}
+
 static unsigned int toku_serialize_brtnode_size_slow (BRTNODE node) {
     unsigned int size=brtnode_header_overhead;
     if (node->height>0) {
@@ -53,12 +60,6 @@ static unsigned int toku_serialize_brtnode_size_slow (BRTNODE node) {
 	return size+hsize+csize;
     } else {
 	unsigned int hsize=0;
-	int addupsize (OMTVALUE lev, u_int32_t UU(idx), void *vp) {
-	    LEAFENTRY le=lev;
-	    unsigned int *ip=vp;
-	    (*ip) += OMT_ITEM_OVERHEAD + leafentry_disksize(le);
-	    return 0;
-	}
 	toku_omt_iterate(node->u.l.buffer,
 			 addupsize,
 			 &hsize);
@@ -91,6 +92,13 @@ unsigned int toku_serialize_brtnode_size (BRTNODE node) {
     return result;
 }
 
+int wbufwriteleafentry (OMTVALUE lev, u_int32_t UU(idx), void *v) {
+    LEAFENTRY le=lev;
+    struct wbuf *thisw=v;
+    wbuf_LEAFENTRY(thisw, le);
+    return 0;
+}
+
 void toku_serialize_brtnode_to (int fd, DISKOFF off, BRTNODE node) {
     //printf("%s:%d serializing\n", __FILE__, __LINE__);
     struct wbuf w;
@@ -178,12 +186,6 @@ void toku_serialize_brtnode_to (int fd, DISKOFF off, BRTNODE node) {
     } else {
 	//printf("%s:%d writing node %lld n_entries=%d\n", __FILE__, __LINE__, node->thisnodename, toku_gpma_n_entries(node->u.l.buffer));
 	wbuf_uint(&w, toku_omt_size(node->u.l.buffer));
-	int wbufwriteleafentry (OMTVALUE lev, u_int32_t UU(idx), void *v) {
-	    LEAFENTRY le=lev;
-	    struct wbuf *thisw=v;
-	    wbuf_LEAFENTRY(thisw, le);
-	    return 0;
-	}
 	toku_omt_iterate(node->u.l.buffer, wbufwriteleafentry, &w);
     }
     assert(w.ndone<=w.size);
@@ -451,6 +453,16 @@ int toku_deserialize_brtnode_from (int fd, DISKOFF off, u_int32_t fullhash, BRTN
     return 0;
 }
 
+int sum_item (OMTVALUE lev, u_int32_t UU(idx), void *vsi) {
+    LEAFENTRY le=lev;
+    struct sum_info *si = vsi;
+    si->count++;
+    si->dsum += OMT_ITEM_OVERHEAD + leafentry_disksize(le);
+    si->msum += leafentry_memsize(le);
+    si->fp  += toku_le_crc(le);
+    return 0;
+}
+
 void toku_verify_counts (BRTNODE node) {
     /*foo*/
     if (node->height==0) {
@@ -461,15 +473,6 @@ void toku_verify_counts (BRTNODE node) {
 	    unsigned int count;
 	    u_int32_t    fp;
 	} sum_info = {0,0,0,0};
-	int sum_item (OMTVALUE lev, u_int32_t UU(idx), void *vsi) {
-	    LEAFENTRY le=lev;
-	    struct sum_info *si = vsi;
-	    si->count++;
-	    si->dsum += OMT_ITEM_OVERHEAD + leafentry_disksize(le);
-	    si->msum += leafentry_memsize(le);
-	    si->fp  += toku_le_crc(le);
-	    return 0;
-	}
 	toku_omt_iterate(node->u.l.buffer, sum_item, &sum_info);
 	assert(sum_info.count==toku_omt_size(node->u.l.buffer));
 	assert(sum_info.dsum==node->u.l.n_bytes_in_buffer);

newbrt/brtdump.c

@@ -76,6 +76,13 @@ void dump_header (int f, struct brt_header **header) {
     }
 }
 
+int print_le(OMTVALUE lev, u_int32_t UU(idx), void *UU(v)) {
+    LEAFENTRY le=lev;
+    print_leafentry(stdout, le);
+    printf("\n");
+    return 0;
+}
+
 void dump_node (int f, DISKOFF off) {
     BRTNODE n;
     int r = toku_deserialize_brtnode_from (f, off, 0 /*pass zero for hash, it doesn't matter*/, &n);
@@ -151,12 +158,6 @@ void dump_node (int f, DISKOFF off) {
     } else {
 	printf(" n_bytes_in_buffer=%d\n", n->u.l.n_bytes_in_buffer);
 	printf(" items_in_buffer  =%d\n", toku_omt_size(n->u.l.buffer));
-	int print_le(OMTVALUE lev, u_int32_t UU(idx), void *UU(v)) {
-	    LEAFENTRY le=lev;
-	    print_leafentry(stdout, le);
-	    printf("\n");
-	    return 0;
-	}
 	if (dump_data) toku_omt_iterate(n->u.l.buffer, print_le, 0);
     }
     toku_brtnode_free(&n);