From: Anatol Belski <ab@php.net>
Date: Mon, 8 Apr 2013 13:51:22 +0000 (+0200)
Subject: fix ident
X-Git-Tag: php-5.4.15RC1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9de5dcad1c3a6090334dceb6ad287e5b2c013f69;p=php

fix ident
---

diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
index 0620fc7f93..8ae572973d 100644
--- a/ext/fileinfo/libmagic/apprentice.c
+++ b/ext/fileinfo/libmagic/apprentice.c
@@ -1163,8 +1163,8 @@ apprentice_load(struct magic_set *ms, const char *fn, int action)
 	}
 
 	/* load directory or file */
-        /* FIXME: Read file names and sort them to prevent
-           non-determinism. See Debian bug #488562. */
+	/* FIXME: Read file names and sort them to prevent
+	   non-determinism. See Debian bug #488562. */
 	if (php_sys_stat(fn, &st) == 0 && S_ISDIR(st.st_mode)) {
 		int mflen;
 		char mfn[MAXPATHLEN];
@@ -1213,21 +1213,21 @@ apprentice_load(struct magic_set *ms, const char *fn, int action)
 		goto out;
 
 	for (j = 0; j < MAGIC_SETS; j++) {
-	/* Set types of tests */
+		/* Set types of tests */
 		for (i = 0; i < mentrycount[j]; ) {
 			if (mentry[j][i].mp->cont_level != 0) {
-			i++;
-			continue;
-		}
-			i = set_text_binary(ms, mentry[j], mentrycount[j], i);
+				i++;
+				continue;
 			}
+			i = set_text_binary(ms, mentry[j], mentrycount[j], i);
+		}
 		qsort(mentry[j], mentrycount[j], sizeof(*mentry[j]),
 		    apprentice_sort);
 
-	/*
+		/*
 		 * Make sure that any level 0 "default" line is last
 		 * (if one exists).
-	 */
+		 */
 		set_last_default(ms, mentry[j], mentrycount[j]);
 
 		/* coalesce per file arrays into a single one */