mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-02 22:34:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix ident

Browse Source
This commit is contained in:
Anatol Belski 2013-04-08 15:51:22 +02:00
parent f3ca1155d6
commit 9de5dcad1c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ext/fileinfo/libmagic/apprentice.c
View File

@ -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 */