Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix ident
  • Loading branch information...
commit b810878e7d49a780a9699a7c01a24fc117c66b6c 2 parents a1f66c0 + 9de5dca
Anatol Belski weltling authored

Showing 1 changed file with 9 additions and 9 deletions. Show diff stats Hide diff stats

  1. +9 9 ext/fileinfo/libmagic/apprentice.c
18 ext/fileinfo/libmagic/apprentice.c
@@ -1163,8 +1163,8 @@ apprentice_load(struct magic_set *ms, const char *fn, int action)
1163 1163 }
1164 1164
1165 1165 /* load directory or file */
1166   - /* FIXME: Read file names and sort them to prevent
1167   - non-determinism. See Debian bug #488562. */
  1166 + /* FIXME: Read file names and sort them to prevent
  1167 + non-determinism. See Debian bug #488562. */
1168 1168 if (php_sys_stat(fn, &st) == 0 && S_ISDIR(st.st_mode)) {
1169 1169 int mflen;
1170 1170 char mfn[MAXPATHLEN];
@@ -1213,21 +1213,21 @@ apprentice_load(struct magic_set *ms, const char *fn, int action)
1213 1213 goto out;
1214 1214
1215 1215 for (j = 0; j < MAGIC_SETS; j++) {
1216   - /* Set types of tests */
  1216 + /* Set types of tests */
1217 1217 for (i = 0; i < mentrycount[j]; ) {
1218 1218 if (mentry[j][i].mp->cont_level != 0) {
1219   - i++;
1220   - continue;
1221   - }
1222   - i = set_text_binary(ms, mentry[j], mentrycount[j], i);
  1219 + i++;
  1220 + continue;
1223 1221 }
  1222 + i = set_text_binary(ms, mentry[j], mentrycount[j], i);
  1223 + }
1224 1224 qsort(mentry[j], mentrycount[j], sizeof(*mentry[j]),
1225 1225 apprentice_sort);
1226 1226
1227   - /*
  1227 + /*
1228 1228 * Make sure that any level 0 "default" line is last
1229 1229 * (if one exists).
1230   - */
  1230 + */
1231 1231 set_last_default(ms, mentry[j], mentrycount[j]);
1232 1232
1233 1233 /* coalesce per file arrays into a single one */

0 comments on commit b810878

Please sign in to comment.
Something went wrong with that request. Please try again.