From 7ce4695ffdc02bbd13e9070f06d06c6f026e9c58 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Wed, 4 Feb 2015 05:35:56 +0900 Subject: [PATCH 2/2] sbin/hammer: cleanups - Minor cleanups to make get_buffer_data() and get_node() look the same. As explained in the previous patch these two are very similar and it's better if the code look similar as well. - hunk1 - no need to dereference indirect pointer **bufferp via direct pointer *buffer in here anymore. - hunk2 - all the rest of the code use **bufferp instead of **bufp. --- sbin/hammer/ondisk.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/sbin/hammer/ondisk.c b/sbin/hammer/ondisk.c index dd50eef..9fc54ef 100644 --- a/sbin/hammer/ondisk.c +++ b/sbin/hammer/ondisk.c @@ -367,13 +367,11 @@ void * get_buffer_data(hammer_off_t buf_offset, struct buffer_info **bufferp, int isnew) { - struct buffer_info *buffer; - - if ((buffer = *bufferp) != NULL) { + if (*bufferp != NULL) { if (isnew > 0 || - ((buffer->buf_offset ^ buf_offset) & ~HAMMER_BUFMASK64)) { - rel_buffer(buffer); - buffer = *bufferp = NULL; + (((*bufferp)->buf_offset ^ buf_offset) & ~HAMMER_BUFMASK64)) { + rel_buffer(*bufferp); + *bufferp = NULL; } } return get_ondisk(buf_offset, bufferp, isnew); @@ -381,16 +379,16 @@ get_buffer_data(hammer_off_t buf_offset, struct buffer_info **bufferp, /* * Retrieve a pointer to a B-Tree node given a cluster offset. The underlying - * bufp is freed if non-NULL and a referenced buffer is loaded into it. + * bufferp is freed if non-NULL and a referenced buffer is loaded into it. */ hammer_node_ondisk_t -get_node(hammer_off_t node_offset, struct buffer_info **bufp) +get_node(hammer_off_t node_offset, struct buffer_info **bufferp) { - if (*bufp) { - rel_buffer(*bufp); - *bufp = NULL; + if (*bufferp != NULL) { + rel_buffer(*bufferp); + *bufferp = NULL; } - return get_ondisk(node_offset, bufp, 0); + return get_ondisk(node_offset, bufferp, 0); } /* -- 2.1.2