Various style tweaks

Author: liweitianux

src/cpdup.c

@@ -407,7 +407,7 @@ main(int ac, char **av)
 	    (long long)CountTargetReadBytes,
 	    (long long)CountWriteBytes,
 	    ((double)CountSourceBytes * 2.0) / ((double)(CountSourceReadBytes + CountTargetReadBytes + CountWriteBytes)));
- 	logstd("%lld source items, %lld items copied, %lld items linked, "
+	logstd("%lld source items, %lld items copied, %lld items linked, "
 	       "%lld things deleted\n",
 	    (long long)CountSourceItems,
 	    (long long)CountCopiedItems,
@@ -512,14 +512,14 @@ OwnerMatch(struct stat *st1, struct stat *st2)
 static int
 FlagsMatch(struct stat *st1, struct stat *st2)
 {
-/*
- * Ignore UF_ARCHIVE.  It gets set automatically by the filesystem, for
- * filesystems that support it.  If the destination filesystem supports it, but
- * it's cleared on the source file, then multiple invocations of cpdup would
- * all try to copy the file because the flags wouldn't match.
- *
- * When unpriveleged, ignore flags we can't set
- */
+    /*
+     * Ignore UF_ARCHIVE.  It gets set automatically by the filesystem, for
+     * filesystems that support it.  If the destination filesystem supports it,
+     * but it's cleared on the source file, then multiple invocations of cpdup
+     * would all try to copy the file because the flags wouldn't match.
+     *
+     * When unpriveleged, ignore flags we can't set
+     */
     u_long ignored = DstRootPrivs ? 0 : SF_SETTABLE;
 
 #ifdef UF_ARCHIVE
@@ -539,7 +539,7 @@ hltlookup(struct stat *stp)
     n = stp->st_ino & HLMASK;
 
     for (hl = hltable[n]; hl; hl = hl->next) {
-        if (hl->ino == stp->st_ino) {
+	if (hl->ino == stp->st_ino) {
 	    ++hl->refs;
 	    return hl;
 	}
@@ -775,13 +775,12 @@ DoCopy(copy_info_t info, struct stat *stat1, int depth)
             if (xlink(hln->name, dpath, stat1->st_flags) < 0) {
 		int tryrelink = (errno == EMLINK);
 		logerr("%-32s hardlink: unable to link to %s: %s\n",
-		    (dpath ? dpath : spath), hln->name, strerror(errno)
-		);
+		       (dpath ? dpath : spath), hln->name, strerror(errno));
                 hltdelete(hln);
                 hln = NULL;
 		if (tryrelink) {
 		    logerr("%-20s hardlink: will attempt to copy normally\n",
-			(dpath ? dpath : spath));
+			   (dpath ? dpath : spath));
 		    goto relink;
 		}
 		++r;
@@ -792,10 +791,8 @@ DoCopy(copy_info_t info, struct stat *stat1, int depth)
 		}
                 if (r == 0) {
 		    if (VerboseOpt) {
-			logstd("%-32s hardlink: %s\n",
-			    (dpath ? dpath : spath),
-			    (st2Valid ? "relinked" : "linked")
-			);
+			logstd("%-32s hardlink: %s\n", (dpath ? dpath : spath),
+			       (st2Valid ? "relinked" : "linked"));
 		    }
 		    CountSourceItems++;
 		    CountCopiedItems++;
@@ -920,9 +917,9 @@ DoCopy(copy_info_t info, struct stat *stat1, int depth)
 		    skipdir = 1;
 		}
 		if (hc_lstat(&DstHost, dpath, &st2) != 0) {
-		    if (NotForRealOpt == 0)
-			    logerr("%s: lstat of newly made dir failed: %s\n",
-				   (dpath ? dpath : spath), strerror(errno));
+		    if (!NotForRealOpt)
+			logerr("%s: lstat of newly made dir failed: %s\n",
+			       (dpath ? dpath : spath), strerror(errno));
 		    st2Valid = 0;
 		    r = 1;
 		    skipdir = 1;
@@ -1093,14 +1090,14 @@ DoCopy(copy_info_t info, struct stat *stat1, int depth)
 	int fd2;
 
 	if (st2Valid)
-		path = mprintf("%s.tmp%d", dpath, (int)getpid());
+	    path = mprintf("%s.tmp%d", dpath, (int)getpid());
 	else
-		path = mprintf("%s", dpath);
+	    path = mprintf("%s", dpath);
 
+#ifndef NOMD5
 	/*
 	 * Handle check failure message.
 	 */
-#ifndef NOMD5
 	if (mres < 0)
 	    logerr("%-32s md5-CHECK-FAILED\n", (dpath) ? dpath : spath);
 #endif
@@ -1461,11 +1458,11 @@ ScanDir(List *list, struct HostConf *host, const char *path,
 	 * ignore . and ..
 	 */
 	if (strcmp(den->d_name, ".") != 0 && strcmp(den->d_name, "..") != 0) {
-	     if (UseCpFile && UseCpFile[0] == '/') {
-		 if (CheckList(list, path, den->d_name) == 0)
-			continue;
-	     }
-	     AddList(list, den->d_name, n, statptr);
+	    if (UseCpFile && UseCpFile[0] == '/') {
+		if (CheckList(list, path, den->d_name) == 0)
+		    continue;
+	    }
+	    AddList(list, den->d_name, n, statptr);
 	}
     }
     hc_closedir(host, dir);
@@ -1735,7 +1732,6 @@ YesNo(const char *path)
  *	destination and rename again.  If that fails too, try to
  *	set the flags back the way they were and give up.
  */
-
 static int
 xrename(const char *src, const char *dst, u_long flags)
 {

src/cpdup.h

@@ -144,4 +144,4 @@ void debug_free(void *ptr);
 
 #define malloc(bytes)	debug_malloc(bytes, __FILE__, __LINE__)
 #define free(ptr)	debug_free(ptr)
-#endif
+#endif /* DEBUG_MALLOC */

src/hclink.c

@@ -507,14 +507,14 @@ hcc_nextitem(hctransaction_t trans, struct HCHead *head, struct HCLeaf *item)
 	item->leafid = hc_bswap16(item->leafid);
 	item->bytes  = hc_bswap32(item->bytes);
 	switch (item->leafid & LCF_TYPEMASK) {
-	    case LCF_INT32:
-		i32ptr = (void *)(item + 1);
-		*i32ptr = hc_bswap32(*i32ptr);
-		break;
-	    case LCF_INT64:
-		i64ptr = (void *)(item + 1);
-		*i64ptr = hc_bswap64(*i64ptr);
-		break;
+	case LCF_INT32:
+	    i32ptr = (void *)(item + 1);
+	    *i32ptr = hc_bswap32(*i32ptr);
+	    break;
+	case LCF_INT64:
+	    i64ptr = (void *)(item + 1);
+	    *i64ptr = hc_bswap64(*i64ptr);
+	    break;
 	}
     }
     assert(head->bytes >= offset + (int)sizeof(*item));
@@ -565,7 +565,7 @@ hcc_debug_dump(hctransaction_t trans, struct HCHead *head)
     fprintf(stderr, "\n");
     FOR_EACH_ITEM(item, trans, head) {
 	fprintf(stderr, "    ITEM %04x DATA ", item->leafid);
-	switch(item->leafid & LCF_TYPEMASK) {
+	switch (item->leafid & LCF_TYPEMASK) {
 	case LCF_INT32:
 	    fprintf(stderr, "int32 %d\n", HCC_INT32(item));
 	    break;

src/hclink.h

@@ -106,9 +106,9 @@ struct HCDesc {
 #define HCC_INT64(item)		(*(int64_t *)((item) + 1))
 #define HCC_BINARYDATA(item)	((void *)((item) + 1))
 
-#define FOR_EACH_ITEM(item, trans, head)	\
-		for (item = hcc_firstitem(trans, head); item; \
-		     item = hcc_nextitem(trans, head, item))
+#define FOR_EACH_ITEM(item, trans, head)		\
+	for (item = hcc_firstitem(trans, head); item;	\
+	     item = hcc_nextitem(trans, head, item))
 
 /*
  * Prototypes
@@ -136,5 +136,4 @@ struct HCLeaf *hcc_currentchaineditem(struct HostConf *hc, struct HCHead *head);
 
 void hcc_debug_dump(struct HCHead *head);
 
-#endif
-
+#endif /* !_HCLINK_H_ */

src/hcproto.c

@@ -634,8 +634,8 @@ rc_closedir(hctransaction_t trans, struct HCHead *head)
 	if (item->leafid == LC_DESCRIPTOR) {
 	    dir = hcc_get_descriptor(trans->hc, HCC_INT32(item), HC_DESC_DIR);
 	    if (dir != NULL) {
-		    hcc_set_descriptor(trans->hc, HCC_INT32(item),
-				       NULL, HC_DESC_DIR);
+		hcc_set_descriptor(trans->hc, HCC_INT32(item),
+				   NULL, HC_DESC_DIR);
 	    }
 	}
     }
@@ -1966,9 +1966,9 @@ rc_utimes(hctransaction_t trans, struct HCHead *head)
     if (path == NULL)
 	return(-2);
     if (head->cmd == HC_LUTIMES)
-	    return(lutimes(path, times));
+	return(lutimes(path, times));
     else
-	    return(utimes(path, times));
+	return(utimes(path, times));
 }
 
 uid_t

src/hcproto.h

@@ -155,5 +155,4 @@ int hc_lutimes(struct HostConf *hc, const char *path, const struct timeval *time
 uid_t hc_geteuid(struct HostConf *hc);
 int hc_getgroups(struct HostConf *hc, gid_t **gidlist);
 
-#endif
-
+#endif /* !_HCPROTO_H_ */

src/md5.c

@@ -58,15 +58,12 @@ md5_flush(void)
     MD5Node *node;
     FILE *fo;
 
-    if (MD5SCacheDirty && MD5SCache && !NotForRealOpt) {
+    if (MD5SCacheDirty && MD5SCache != NULL && !NotForRealOpt) {
 	if ((fo = fopen(MD5SCache, "w")) != NULL) {
 	    for (node = MD5Base; node; node = node->md_Next) {
 		if (node->md_Accessed && node->md_Code[0] != '\0') {
-		    fprintf(fo, "%s %zu %s\n",
-			node->md_Code,
-			strlen(node->md_Name),
-			node->md_Name
-		    );
+		    fprintf(fo, "%s %zu %s\n", node->md_Code,
+			    strlen(node->md_Name), node->md_Name);
 		}
 	    }
 	    fclose(fo);
@@ -78,7 +75,7 @@ md5_flush(void)
 
     MD5SCacheDirty = 0;
 
-    if (MD5SCache) {
+    if (MD5SCache != NULL) {
 	while ((node = MD5Base) != NULL) {
 	    MD5Base = node->md_Next;
 
@@ -99,9 +96,8 @@ md5_cache(const char *spath, int sdirlen)
     /*
      * Already cached
      */
-
     if (
-	MD5SCache &&
+	MD5SCache != NULL &&
 	sdirlen == MD5SCacheDirLen &&
 	strncmp(spath, MD5SCache, sdirlen) == 0
     ) {

src/misc.c

@@ -149,7 +149,7 @@ debug_free(void *ptr)
 	}
 }
 
-#endif
+#endif /* DEBUG_MALLOC */
 
 void
 fatal(const char *ctl, ...)