X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl_abi.c;h=794005b695d47e82fc7adec6561c3e150157a283;hp=2994f25ded8b8216b8a2b4cebeeae9aaa2d652ba;hb=2559f07a178b681dc240e20153ff5abdff54cb34;hpb=2f5af21b263403997e154658635d6b6e6eaab453

diff --git a/src/types/decl_abi.c b/src/types/decl_abi.c
index 2994f25..794005b 100644
--- a/src/types/decl_abi.c
+++ b/src/types/decl_abi.c
@@ -5,11 +5,11 @@
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
 
-     * Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
 
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -21,54 +21,53 @@
  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*******************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#else
-# include "php_config.h"
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+ *******************************************************************************/
 
+#include "php_psi_stdinc.h"
 #include "data.h"
 
-decl_abi *init_decl_abi(const char *convention) {
-	decl_abi *abi = calloc(1, sizeof(*abi));
-	abi->convention = strdup(convention);
+struct psi_decl_abi *psi_decl_abi_init(zend_string *convention)
+{
+	struct psi_decl_abi *abi = calloc(1, sizeof(*abi));
+	abi->convention = convention
+			? zend_string_copy(convention)
+			: zend_string_init_interned(ZEND_STRL("default"), 1);
 	return abi;
 }
 
-void free_decl_abi(decl_abi *abi) {
-	if (abi->token) {
-		free(abi->token);
+void psi_decl_abi_free(struct psi_decl_abi **abi_ptr)
+{
+	if (*abi_ptr) {
+		struct psi_decl_abi *abi = *abi_ptr;
+
+		*abi_ptr = NULL;
+		psi_token_free(&abi->token);
+		zend_string_release(abi->convention);
+		free(abi);
 	}
-	free(abi->convention);
-	free(abi);
 }
 
-void dump_decl_abi(int fd, decl_abi *abi) {
-	dprintf(fd, "%s", abi->convention);
+void psi_decl_abi_dump(int fd, struct psi_decl_abi *abi)
+{
+	dprintf(fd, "%s", abi->convention->val);
 }
 
 static const char * const abi_ccs[] = {
 		"default", /* \                 */
 		"extern",  /*  > - all the same */
 		"cdecl",   /* /                 */
-		"mscdecl",
 		"stdcall",
 		"fastcall",
 };
 
-int validate_decl_abi(struct psi_data *data, decl_abi *abi) {
+bool psi_decl_abi_validate(struct psi_data *data, struct psi_decl_abi *abi)
+{
 	size_t i;
 
-	for (i = 0; i < sizeof(abi_ccs)/sizeof(char*); ++i) {
-		if (strcasecmp(abi->convention, abi_ccs[i])) {
-			return 1;
+	for (i = 0; i < sizeof(abi_ccs) / sizeof(char *); ++i) {
+		if (!strcasecmp(abi->convention->val, abi_ccs[i])) {
+			return true;
 		}
 	}
-	return 0;
+	return false;
 }