Merge branch 'pull-request/1235'

smalyshev · smalyshev · commit 80bd148cc9af · 2015-04-18T19:36:37.000-07:00
* pull-request/1235:
  modify skeleton confirm_extname_compiled
  modify skeleton.c function
diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c
@@ -37,16 +37,15 @@ PHP_FUNCTION(confirm_extname_compiled)
 {
 	char *arg = NULL;
 	size_t arg_len, len;
-	char *strg;
+	zend_string *strg;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &arg, &arg_len) == FAILURE) {
 		return;
 	}
 
-	len = spprintf(&strg, 0, "Congratulations! You have successfully modified ext/%.78s/config.m4. Module %.78s is now compiled into PHP.", "extname", arg);
+	strg = strpprintf(0, "Congratulations! You have successfully modified ext/%.78s/config.m4. Module %.78s is now compiled into PHP.", "extname", arg);
 
-	RETVAL_STRINGL(strg, len);
-	efree(strg);
+	RETURN_STR(strg);
 }
 /* }}} */
 /* The previous line is meant for vim and emacs, so it can correctly fold and

Original file line number	Diff line number	Diff line change
`@@ -37,16 +37,15 @@ PHP_FUNCTION(confirm_extname_compiled)`
`37`	`37`	`{`
`38`	`38`	`char *arg = NULL;`
`39`	`39`	`size_t arg_len, len;`
`40`		`- char *strg;`
	`40`	`+ zend_string *strg;`
`41`	`41`
`42`	`42`	`if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &arg, &arg_len) == FAILURE) {`
`43`	`43`	`return;`
`44`	`44`	`}`
`45`	`45`
`46`		`- len = spprintf(&strg, 0, "Congratulations! You have successfully modified ext/%.78s/config.m4. Module %.78s is now compiled into PHP.", "extname", arg);`
	`46`	`+ strg = strpprintf(0, "Congratulations! You have successfully modified ext/%.78s/config.m4. Module %.78s is now compiled into PHP.", "extname", arg);`
`47`	`47`
`48`		`- RETVAL_STRINGL(strg, len);`
`49`		`- efree(strg);`
	`48`	`+ RETURN_STR(strg);`
`50`	`49`	`}`
`51`	`50`	`/* }}} */`
`52`	`51`	`/* The previous line is meant for vim and emacs, so it can correctly fold and`