archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

- No C++ comments.

Browse source
This commit is contained in:
Derick Rethans 2008-07-25 08:18:34 +00:00
parent 1fdbee278a
commit 0192c570c8
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/fileinfo/libmagic.patch
View file

@ -2,10 +2,9 @@ Index: libmagic/apprentice.c
=================================================================== ===================================================================
RCS file: /repository/pecl/fileinfo/libmagic/apprentice.c,v RCS file: /repository/pecl/fileinfo/libmagic/apprentice.c,v
retrieving revision 1.1 retrieving revision 1.1
retrieving revision 1.6 diff -u -r1.1 apprentice.c
diff -u -r1.1 -r1.6
--- libmagic/apprentice.c 11 Jul 2008 14:13:50 -0000 1.1 --- libmagic/apprentice.c 11 Jul 2008 14:13:50 -0000 1.1
+++ libmagic/apprentice.c 25 Jul 2008 08:16:03 -0000 1.6 +++ libmagic/apprentice.c 25 Jul 2008 08:18:07 -0000
@@ -157,6 +157,10 @@ @@ -157,6 +157,10 @@
} }
#endif /* COMPILE_ONLY */ #endif /* COMPILE_ONLY */
@ -99,7 +98,7 @@ diff -u -r1.1 -r1.6
+#ifdef PHP_BUNDLE +#ifdef PHP_BUNDLE
+ if (fn == NULL) + if (fn == NULL)
+ *nmagicp = (sizeof(php_magic_database) / sizeof(struct magic)); + *nmagicp = (sizeof(php_magic_database) / sizeof(struct magic));
+ else // the statement after the #endif is used + else /* the statement after the #endif is used */
+#endif +#endif
*nmagicp = (uint32_t)(st.st_size / sizeof(struct magic)); *nmagicp = (uint32_t)(st.st_size / sizeof(struct magic));
if (*nmagicp > 0) if (*nmagicp > 0)

2
ext/fileinfo/libmagic/apprentice.c
View file

@ -1978,7 +1978,7 @@ internal_loaded:
#ifdef PHP_BUNDLE #ifdef PHP_BUNDLE
if (fn == NULL) if (fn == NULL)
*nmagicp = (sizeof(php_magic_database) / sizeof(struct magic)); *nmagicp = (sizeof(php_magic_database) / sizeof(struct magic));
else // the statement after the #endif is used else /* the statement after the #endif is used */
#endif #endif
*nmagicp = (uint32_t)(st.st_size / sizeof(struct magic)); *nmagicp = (uint32_t)(st.st_size / sizeof(struct magic));
if (*nmagicp > 0) if (*nmagicp > 0)