derick Fri Aug 29 12:05:46 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/fileinfo/libmagic apprentice.c file.h funcs.c magic.c
print.c
Log:
- MFH: Some more cleanups, and fixed some warnings.
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/apprentice.c?r1=1.7.2.2&r2=1.7.2.3&diff_format=u
Index: php-src/ext/fileinfo/libmagic/apprentice.c
diff -u php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.2
php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.3
--- php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.2 Fri Aug 29 09:49:01 2008
+++ php-src/ext/fileinfo/libmagic/apprentice.c Fri Aug 29 12:05:46 2008
@@ -235,7 +235,6 @@
return rv;
}
-#ifndef COMPILE_ONLY
if ((rv = apprentice_map(ms, &magic, &nmagic, fn)) == -1) {
if (ms->flags & MAGIC_CHECK)
file_magwarn(ms, "using regular magic file `%s'", fn);
@@ -263,7 +262,6 @@
mlist->prev = ml;
return 0;
-#endif /* COMPILE_ONLY */
}
protected void
@@ -464,7 +462,7 @@
return 1;
}
-private int
+private void
set_test_type(struct magic *mstart, struct magic *m)
{
switch (m->type) {
@@ -599,7 +597,7 @@
if (stat(fn, &st) == 0 && S_ISDIR(st.st_mode)) {
dir = opendir(fn);
if (dir) {
- while (d = readdir(dir)) {
+ while ((d = readdir(dir))) {
snprintf(subfn, sizeof(subfn), "%s/%s",
fn, d->d_name);
if (stat(subfn, &st) == 0 &&
S_ISREG(st.st_mode)) {
@@ -1266,11 +1264,9 @@
if (check_format(ms, m) == -1)
return -1;
}
-#ifndef COMPILE_ONLY
if (action == FILE_CHECK) {
file_mdump(m);
}
-#endif
m->mimetype[0] = '\0'; /* initialise MIME type to none */
if (m->cont_level == 0)
++(*nmentryp); /* make room for next */
@@ -1862,7 +1858,6 @@
fd = -1;
internal_loaded:
-
*magicp = mm;
ptr = (uint32_t *)(void *)*magicp;
if (*ptr != MAGICNO) {
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/file.h?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/fileinfo/libmagic/file.h
diff -u php-src/ext/fileinfo/libmagic/file.h:1.1.2.2
php-src/ext/fileinfo/libmagic/file.h:1.1.2.3
--- php-src/ext/fileinfo/libmagic/file.h:1.1.2.2 Fri Aug 29 09:49:01 2008
+++ php-src/ext/fileinfo/libmagic/file.h Fri Aug 29 12:05:46 2008
@@ -354,10 +354,8 @@
protected int file_check_mem(struct magic_set *, unsigned int);
protected int file_looks_utf8(const unsigned char *, size_t, unichar *, size_t
*);
-#ifndef COMPILE_ONLY
extern const char *file_names[];
extern const size_t file_nnames;
-#endif
#ifndef HAVE_STRERROR
extern int sys_nerr;
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/funcs.c?r1=1.3.2.3&r2=1.3.2.4&diff_format=u
Index: php-src/ext/fileinfo/libmagic/funcs.c
diff -u php-src/ext/fileinfo/libmagic/funcs.c:1.3.2.3
php-src/ext/fileinfo/libmagic/funcs.c:1.3.2.4
--- php-src/ext/fileinfo/libmagic/funcs.c:1.3.2.3 Wed Aug 27 00:17:27 2008
+++ php-src/ext/fileinfo/libmagic/funcs.c Fri Aug 29 12:05:46 2008
@@ -145,7 +145,6 @@
file_error(ms, errno, "error reading");
}
-#ifndef COMPILE_ONLY
protected int
file_buffer(struct magic_set *ms, int fd, const char *inname, const void *buf,
size_t nb)
@@ -218,7 +217,6 @@
#endif
return m;
}
-#endif
protected int
file_reset(struct magic_set *ms)
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/magic.c?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/fileinfo/libmagic/magic.c
diff -u php-src/ext/fileinfo/libmagic/magic.c:1.1.2.1
php-src/ext/fileinfo/libmagic/magic.c:1.1.2.2
--- php-src/ext/fileinfo/libmagic/magic.c:1.1.2.1 Tue Aug 26 12:23:29 2008
+++ php-src/ext/fileinfo/libmagic/magic.c Fri Aug 29 12:05:46 2008
@@ -82,9 +82,7 @@
private void close_and_restore(const struct magic_set *, const char *, int,
const struct stat *);
private int info_from_stat(struct magic_set *, mode_t);
-#ifndef COMPILE_ONLY
private const char *file_or_fd(struct magic_set *, const char *, int);
-#endif
#ifndef STDIN_FILENO
#define STDIN_FILENO 0
@@ -235,7 +233,6 @@
}
}
-#ifndef COMPILE_ONLY
/*
* find type of descriptor
@@ -372,7 +369,6 @@
}
return file_getbuffer(ms);
}
-#endif
public const char *
magic_error(struct magic_set *ms)
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/print.c?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/fileinfo/libmagic/print.c
diff -u php-src/ext/fileinfo/libmagic/print.c:1.1.2.1
php-src/ext/fileinfo/libmagic/print.c:1.1.2.2
--- php-src/ext/fileinfo/libmagic/print.c:1.1.2.1 Fri Aug 29 09:49:01 2008
+++ php-src/ext/fileinfo/libmagic/print.c Fri Aug 29 12:05:46 2008
@@ -46,7 +46,6 @@
#define SZOF(a) (sizeof(a) / sizeof(a[0]))
-#ifndef COMPILE_ONLY
protected void
file_mdump(struct magic *m)
{
@@ -177,7 +176,6 @@
}
(void) fprintf(stderr, ",\"%s\"]\n", m->desc);
}
-#endif
/*VARARGS*/
protected void
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
