Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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 with 9 additions and 9 deletions.
  1. +9 −9 ext/fileinfo/libmagic/apprentice.c
18 ext/fileinfo/libmagic/apprentice.c
View
@@ -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 */
Please sign in to comment.
Something went wrong with that request. Please try again.