types refactoring

[m6w6/ext-psi] / src / types / let_calloc.h

diff --git a/src/types/let_calloc.h b/src/types/let_calloc.h
index e6d3f91c8b73cf251ab4ebdf1fcd0f91bda61382..dd0e65a8a9052286f8befacbcca4d24425f13211 100644 (file)
--- a/src/types/let_calloc.h
+++ b/src/types/let_calloc.h
@@ -1,22 +1,39 @@
-#ifndef _PSI_TYPES_LET_CALLOC_H
-#define _PSI_TYPES_LET_CALLOC_H
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ 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.
+*******************************************************************************/
+
+#ifndef PSI_TYPES_LET_CALLOC_H
+#define PSI_TYPES_LET_CALLOC_H
+
+#include "num_exp.h"
 
 typedef struct let_calloc {
        num_exp *nmemb;
        num_exp *size;
 } let_calloc;
 
-static inline let_calloc *init_let_calloc(num_exp *nmemb, num_exp *size) {
-       let_calloc *alloc = calloc(1, sizeof(*alloc));
-       alloc->nmemb = nmemb;
-       alloc->size = size;
-       return alloc;
-}
-
-static inline void free_let_calloc(let_calloc *alloc) {
-       free_num_exp(alloc->nmemb);
-       free_num_exp(alloc->size);
-       free(alloc);
-}
+let_calloc *init_let_calloc(num_exp *nmemb, num_exp *size);
+void free_let_calloc(let_calloc *alloc);
 
 #endif