simplify error handling for dirs as magic

weltling · weltling · commit 43652d386a75 · 2015-01-22T10:16:13.000+01:00
diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
@@ -2616,7 +2616,7 @@ apprentice_map(struct magic_set *ms, const char *fn)
 	return to give apprentice_load() a chance. */
 	if (php_stream_stat_path_ex((char *)fn, 0, &st, NULL) == SUCCESS) {
                if (st.sb.st_mode & S_IFDIR) {
-                       goto error;
+                       return NULL;
                }
        }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -2616,7 +2616,7 @@ apprentice_map(struct magic_set ms, const char fn)`
`2616`	`2616`	`return to give apprentice_load() a chance. */`
`2617`	`2617`	`if (php_stream_stat_path_ex((char *)fn, 0, &st, NULL) == SUCCESS) {`
`2618`	`2618`	`if (st.sb.st_mode & S_IFDIR) {`
`2619`		`- goto error;`
	`2619`	`+ return NULL;`
`2620`	`2620`	`}`
`2621`	`2621`	`}`
`2622`	`2622`	`#endif`