X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl_var.h;h=ca9a5fde5bae47913e291c6b5148b033bf82c686;hp=69f9adc34749eab2b27c50e17493db9da916180c;hb=2fa436074ca9a5e87f39b696de832fa2188fcfc6;hpb=d57dd73ddbd960613cfc06bc4c9473b71d3598ef

diff --git a/src/types/decl_var.h b/src/types/decl_var.h
index 69f9adc..ca9a5fd 100644
--- a/src/types/decl_var.h
+++ b/src/types/decl_var.h
@@ -35,32 +35,17 @@ struct psi_validate_scope;
 
 struct psi_decl_var {
 	struct psi_token *token;
-	char *name, *fqn;
+	zend_string *name, *fqn;
 	unsigned pointer_level;
 	unsigned array_size;
 	struct psi_decl_arg *arg;
 };
 
-struct psi_decl_var *psi_decl_var_init(const char *name, unsigned pl, unsigned as);
+struct psi_decl_var *psi_decl_var_init(zend_string *name, unsigned pl, unsigned as);
 struct psi_decl_var *psi_decl_var_copy(struct psi_decl_var *src);
 void psi_decl_var_free(struct psi_decl_var **var_ptr);
 void psi_decl_var_dump(int fd, struct psi_decl_var *var);
 
-#include <string.h>
-
-static inline char *psi_decl_var_name_prepend(char *current, const char *prepend) {
-	size_t c_len = strlen(current);
-	size_t p_len = strlen(prepend);
-
-	current = realloc(current, p_len + 1 + c_len + 1);
-	if (current) {
-		memmove(current + p_len + 1, current, c_len + 1);
-		current[p_len] = '.';
-		memcpy(current, prepend, p_len);
-	}
-	return current;
-}
-
 bool psi_decl_var_validate(struct psi_data *data, struct psi_decl_var *dvar,
 		struct psi_validate_scope *scope);