Skip to content

Commit 48200cb

Browse files
author
foobar
committed
ws & cs
1 parent 63ae807 commit 48200cb

File tree

3 files changed

+374
-361
lines changed

3 files changed

+374
-361
lines changed

ext/tidy/config.m4

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,33 @@ PHP_ARG_WITH(tidy,for TIDY support,
66
[ --with-tidy[=DIR] Include TIDY support])
77

88
if test "$PHP_TIDY" != "no"; then
9-
PHP_NEW_EXTENSION(tidy, tidy.c, $ext_shared)
10-
if test "$PHP_TIDY" != "yes"; then
11-
TIDY_SEARCH_DIRS=$PHP_TIDY
12-
else
13-
TIDY_SEARCH_DIRS="/usr/local /usr"
14-
fi
15-
for i in $TIDY_SEARCH_DIRS; do
16-
if test -f $i/include/tidy/tidy.h; then
17-
TIDY_DIR=$i
18-
TIDY_INCDIR=$i/include/tidy
19-
elif test -f $i/include/tidy.h; then
20-
TIDY_DIR=$i
21-
TIDY_INCDIR=$i/include
22-
fi
23-
done
24-
25-
if test -z "$TIDY_DIR"; then
26-
AC_MSG_ERROR(Cannot find libtidy)
27-
fi
28-
29-
TIDY_LIBDIR=$TIDY_DIR/lib
30-
31-
AC_DEFINE(HAVE_TIDY,1,[ ])
32-
PHP_SUBST(TIDY_SHARED_LIBADD)
33-
PHP_ADD_LIBRARY_WITH_PATH(tidy, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
34-
PHP_ADD_INCLUDE($TIDY_INCDIR)
9+
10+
if test "$PHP_TIDY" != "yes"; then
11+
TIDY_SEARCH_DIRS=$PHP_TIDY
12+
else
13+
TIDY_SEARCH_DIRS="/usr/local /usr"
14+
fi
15+
16+
for i in $TIDY_SEARCH_DIRS; do
17+
if test -f $i/include/tidy/tidy.h; then
18+
TIDY_DIR=$i
19+
TIDY_INCDIR=$i/include/tidy
20+
elif test -f $i/include/tidy.h; then
21+
TIDY_DIR=$i
22+
TIDY_INCDIR=$i/include
23+
fi
24+
done
25+
26+
if test -z "$TIDY_DIR"; then
27+
AC_MSG_ERROR(Cannot find libtidy)
28+
fi
29+
30+
TIDY_LIBDIR=$TIDY_DIR/lib
31+
32+
PHP_ADD_LIBRARY_WITH_PATH(tidy, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
33+
PHP_ADD_INCLUDE($TIDY_INCDIR)
34+
35+
PHP_NEW_EXTENSION(tidy, tidy.c, $ext_shared)
36+
PHP_SUBST(TIDY_SHARED_LIBADD)
37+
AC_DEFINE(HAVE_TIDY,1,[ ])
3538
fi

ext/tidy/php_tidy.h

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ extern zend_module_entry tidy_module_entry;
9898
ce.create_object = tidy_object_new_ ## name; \
9999
tidy_ce_ ## name = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \
100100
tidy_ce_ ## name->ce_flags |= ZEND_ACC_FINAL_CLASS; \
101-
memcpy(&tidy_object_handlers_ ## name, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); \
101+
memcpy(&tidy_object_handlers_ ## name, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); \
102102
tidy_object_handlers_ ## name.clone_obj = NULL; \
103-
}
103+
}
104104

105105
#define TIDY_TAG_CONST(tag) REGISTER_LONG_CONSTANT("TIDY_TAG_" #tag, TidyTag_##tag, CONST_CS | CONST_PERSISTENT)
106106
#define TIDY_ATTR_CONST(attr) REGISTER_LONG_CONSTANT("TIDY_ATTR_" #attr, TidyAttr_##attr, CONST_CS | CONST_PERSISTENT)
@@ -148,8 +148,8 @@ if (!_obj->ptdoc->parsed) { \
148148
#define TIDY_PARSED_REPAIR_CHECK(_obj) \
149149
TIDY_PARSED_CHECK(_obj); \
150150
if (!_obj->ptdoc->repaired) { \
151-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must clean and repair the document before executing this function."); \
152-
RETURN_FALSE; \
151+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must clean and repair the document before executing this function."); \
152+
RETURN_FALSE; \
153153
}
154154

155155
#define TIDY_SAFE_MODE_CHECK(filename) \
@@ -168,34 +168,33 @@ typedef struct _PHPTidyDoc PHPTidyDoc;
168168
typedef struct _PHPTidyObj PHPTidyObj;
169169

170170
typedef enum {
171-
is_node,
172-
is_attr,
173-
is_doc,
174-
is_exception
171+
is_node,
172+
is_attr,
173+
is_doc,
174+
is_exception
175175
} tidy_obj_type;
176176

177177
typedef enum {
178-
is_root_node,
179-
is_html_node,
180-
is_head_node,
181-
is_body_node
178+
is_root_node,
179+
is_html_node,
180+
is_head_node,
181+
is_body_node
182182
} tidy_base_nodetypes;
183183

184184
struct _PHPTidyDoc {
185-
TidyDoc doc;
186-
TidyBuffer *errbuf;
187-
zend_bool parsed;
188-
zend_bool repaired;
189-
unsigned int ref_count;
185+
TidyDoc doc;
186+
TidyBuffer *errbuf;
187+
zend_bool parsed;
188+
zend_bool repaired;
189+
unsigned int ref_count;
190190
};
191191

192192
struct _PHPTidyObj {
193-
zend_object std;
194-
TidyNode node;
195-
TidyAttr attr;
196-
tidy_obj_type type;
197-
198-
PHPTidyDoc *ptdoc;
193+
zend_object std;
194+
TidyNode node;
195+
TidyAttr attr;
196+
tidy_obj_type type;
197+
PHPTidyDoc *ptdoc;
199198
};
200199

201200
static char *php_tidy_file_to_mem(char *, zend_bool TSRMLS_DC);

0 commit comments

Comments
 (0)