projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
travis: update
[m6w6/ext-psi]
/
src
/
types
/
decl_enum_item.c
diff --git
a/src/types/decl_enum_item.c
b/src/types/decl_enum_item.c
index 7410e01d7621b3b319b15a6582d59bb895db9bef..b20595b6849f4f7d4338462983f261d7eea8cf31 100644
(file)
--- a/
src/types/decl_enum_item.c
+++ b/
src/types/decl_enum_item.c
@@
-23,14
+23,18
@@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
#include "data.h"
#include "data.h"
-struct psi_decl_enum_item *psi_decl_enum_item_init(
const char
*name,
+struct psi_decl_enum_item *psi_decl_enum_item_init(
zend_string
*name,
struct psi_num_exp *num)
{
struct psi_num_exp *num)
{
- struct psi_decl_enum_item *i =
calloc(1, sizeof(*i)
);
- i->name =
strdup
(name);
+ struct psi_decl_enum_item *i =
pecalloc(1, sizeof(*i), 1
);
+ i->name =
zend_string_copy
(name);
i->num = num;
return i;
}
i->num = num;
return i;
}
@@
-41,9
+45,7
@@
void psi_decl_enum_item_free(struct psi_decl_enum_item **i_ptr)
struct psi_decl_enum_item *i = *i_ptr;
*i_ptr = NULL;
struct psi_decl_enum_item *i = *i_ptr;
*i_ptr = NULL;
- if (i->token) {
- free(i->token);
- }
+ psi_token_free(&i->token);
if (i->num) {
if (i->num == &i->inc) {
switch (i->inc.op) {
if (i->num) {
if (i->num == &i->inc) {
switch (i->inc.op) {
@@
-61,17
+63,17
@@
void psi_decl_enum_item_free(struct psi_decl_enum_item **i_ptr)
psi_num_exp_free(&i->num);
}
}
psi_num_exp_free(&i->num);
}
}
-
fre
e(i->name);
+
zend_string_releas
e(i->name);
free(i);
}
}
free(i);
}
}
-void psi_decl_enum_item_dump(
int fd
, struct psi_decl_enum_item *item)
+void psi_decl_enum_item_dump(
struct psi_dump *dump
, struct psi_decl_enum_item *item)
{
{
-
dprintf(fd, "%s", item->name
);
+
PSI_DUMP(dump, "%s", item->name->val
);
if (item->num && item->num != &item->inc) {
if (item->num && item->num != &item->inc) {
-
dprintf(fd
, " = ");
- psi_num_exp_dump(
fd
, item->num);
+
PSI_DUMP(dump
, " = ");
+ psi_num_exp_dump(
dump
, item->num);
}
}
}
}