[Midnightbsd-cvs] src [7329] trunk/lib/libmport/verify.c: code cleanup and formatting fixes.

[laffer1 at midnightbsd.org]

Revision: 7329
          http://svnweb.midnightbsd.org/src/?rev=7329
Author:   laffer1
Date:     2015-09-26 15:03:19 -0400 (Sat, 26 Sep 2015)
Log Message:
-----------
code cleanup and formatting fixes.

Modified Paths:
--------------
    trunk/lib/libmport/verify.c

Modified: trunk/lib/libmport/verify.c
===================================================================
--- trunk/lib/libmport/verify.c	2015-09-26 19:03:00 UTC (rev 7328)
+++ trunk/lib/libmport/verify.c	2015-09-26 19:03:19 UTC (rev 7329)
@@ -39,7 +39,8 @@
 #include "mport_private.h"
 
 MPORT_PUBLIC_API int
-mport_verify_package(mportInstance *mport, mportPackageMeta *pack) {
+mport_verify_package(mportInstance *mport, mportPackageMeta *pack)
+{
 	sqlite3_stmt *stmt;
 	mportAssetListEntryType type;
 	int ret;
@@ -52,58 +53,58 @@
 		RETURN_CURRENT_ERROR;
 	
 	while (1) {
-		ret = sqlite3_step(stmt);
-		
-		if (ret == SQLITE_DONE)
-			break;
-			
-		if (ret != SQLITE_ROW) {
-			/* some error occured */
-			SET_ERROR(MPORT_ERR_FATAL, sqlite3_errmsg(mport->db));
-			sqlite3_finalize(stmt);
-			RETURN_CURRENT_ERROR;
-		}
-		
-		type	 = (mportAssetListEntryType)sqlite3_column_int(stmt, 0);
-		data	 = sqlite3_column_text(stmt, 1);
-		checksum = sqlite3_column_text(stmt, 2);
+        ret = sqlite3_step(stmt);
 
-		char file[FILENAME_MAX];
-		/* XXX TMP */
-		if (data == NULL) {
-			/* XXX data is null when ASSET_CHMOD (mode) or similar commands are in plist */
-			snprintf(file, sizeof(file), "%s", mport->root);
-		} else if (*data == '/') {
-			snprintf(file, sizeof(file), "%s%s", mport->root, data);
-		} else {
-			snprintf(file, sizeof(file), "%s%s/%s", mport->root, pack->prefix, data);
-		}
+        if (ret == SQLITE_DONE)
+            break;
 
-		switch (type) {
-			case ASSET_FILE:
-			case ASSET_SAMPLE:
-				if (lstat(file, &st) != 0) {
-					mport_call_msg_cb(mport, "Can't stat %s: %s", file, strerror(errno));
-					break; /* next asset */
-				} 				
-				
-				if (S_ISREG(st.st_mode)) {
-					if (MD5File(file, md5) == NULL) 
-						mport_call_msg_cb(mport, "Can't md5 %s: %s", file, strerror(errno));
+        if (ret != SQLITE_ROW) {
+            /* some error occured */
+            SET_ERROR(MPORT_ERR_FATAL, sqlite3_errmsg(mport->db));
+            sqlite3_finalize(stmt);
+            RETURN_CURRENT_ERROR;
+        }
 
-					if (md5 == NULL)
-						mport_call_msg_cb(mport, "Destination checksum could not be computed %s", file);
-					else if (checksum == NULL)
-						mport_call_msg_cb(mport, "Source checksum missing %s", file);
-					else if (strcmp(md5, checksum) != 0) 
-						mport_call_msg_cb(mport, "Checksum mismatch: %s %s %s", file, md5, checksum);
-				}
-				
-				break;
-			default:
-				/* do nothing */
-				break;
-		}
+        type = (mportAssetListEntryType) sqlite3_column_int(stmt, 0);
+        data = sqlite3_column_text(stmt, 1);
+        checksum = sqlite3_column_text(stmt, 2);
+
+        char file[FILENAME_MAX];
+        /* XXX TMP */
+        if (data == NULL) {
+            /* XXX data is null when ASSET_CHMOD (mode) or similar commands are in plist */
+            snprintf(file, sizeof(file), "%s", mport->root);
+        } else if (*data == '/') {
+            snprintf(file, sizeof(file), "%s%s", mport->root, data);
+        } else {
+            snprintf(file, sizeof(file), "%s%s/%s", mport->root, pack->prefix, data);
+        }
+
+        switch (type) {
+            case ASSET_FILE:
+            case ASSET_SAMPLE:
+                if (lstat(file, &st) != 0) {
+                    mport_call_msg_cb(mport, "Can't stat %s: %s", file, strerror(errno));
+                    break; /* next asset */
+                }
+
+                if (S_ISREG(st.st_mode)) {
+                    if (MD5File(file, md5) == NULL)
+                        mport_call_msg_cb(mport, "Can't md5 %s: %s", file, strerror(errno));
+
+                    if (md5 == NULL)
+                        mport_call_msg_cb(mport, "Destination checksum could not be computed %s", file);
+                    else if (checksum == NULL)
+                        mport_call_msg_cb(mport, "Source checksum missing %s", file);
+                    else if (strcmp(md5, checksum) != 0)
+                        mport_call_msg_cb(mport, "Checksum mismatch: %s %s %s", file, md5, checksum);
+                }
+
+                break;
+            default:
+                /* do nothing */
+                break;
+        }
 	}
 
 	sqlite3_finalize(stmt);