projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
zend_string'ify
[m6w6/ext-psi]
/
src
/
types
/
decl_enum.c
diff --git
a/src/types/decl_enum.c
b/src/types/decl_enum.c
index 026c375c4223f6661a4f56e4ad155d6265022308..f060bf390546700ff086b6ee54f50fc184af438a 100644
(file)
--- a/
src/types/decl_enum.c
+++ b/
src/types/decl_enum.c
@@
-26,10
+26,10
@@
#include "php_psi_stdinc.h"
#include "data.h"
#include "php_psi_stdinc.h"
#include "data.h"
-struct psi_decl_enum *psi_decl_enum_init(
const char
*name, struct psi_plist *l)
+struct psi_decl_enum *psi_decl_enum_init(
zend_string
*name, struct psi_plist *l)
{
struct psi_decl_enum *e = calloc(1, sizeof(*e));
{
struct psi_decl_enum *e = calloc(1, sizeof(*e));
- e->name =
strdup
(name);
+ e->name =
zend_string_copy
(name);
e->items = l;
return e;
}
e->items = l;
return e;
}
@@
-40,20
+40,18
@@
void psi_decl_enum_free(struct psi_decl_enum **e_ptr)
struct psi_decl_enum *e = *e_ptr;
*e_ptr = NULL;
struct psi_decl_enum *e = *e_ptr;
*e_ptr = NULL;
- if (e->token) {
- free(e->token);
- }
+ psi_token_free(&e->token);
if (e->items) {
psi_plist_free(e->items);
}
if (e->items) {
psi_plist_free(e->items);
}
-
fre
e(e->name);
+
zend_string_releas
e(e->name);
free(e);
}
}
void psi_decl_enum_dump(int fd, struct psi_decl_enum *e, unsigned level)
{
free(e);
}
}
void psi_decl_enum_dump(int fd, struct psi_decl_enum *e, unsigned level)
{
- dprintf(fd, "enum %s {\n", e->name);
+ dprintf(fd, "enum %s {\n", e->name
->val
);
if (e->items) {
size_t i = 0;
struct psi_decl_enum_item *item;
if (e->items) {
size_t i = 0;
struct psi_decl_enum_item *item;
@@
-75,7
+73,7
@@
bool psi_decl_enum_validate(struct psi_data *data, struct psi_decl_enum *e)
struct psi_decl_enum_item *i, *p = NULL;
if (!psi_plist_count(e->items)) {
struct psi_decl_enum_item *i, *p = NULL;
if (!psi_plist_count(e->items)) {
- data->error(data, e->token, PSI_WARNING, "Empty enum '%s'", e->name);
+ data->error(data, e->token, PSI_WARNING, "Empty enum '%s'", e->name
->val
);
return false;
}
return false;
}