Fixes for review comments by auroraeosrose

Author: Keyur Govande

sapi/cli/php_cli.c

@@ -482,7 +482,7 @@ ZEND_END_ARG_INFO()
 static const zend_function_entry additional_functions[] = {
 	ZEND_FE(dl, arginfo_dl)
 	PHP_FE(cli_set_process_title,        arginfo_cli_set_process_title)
-	PHP_FE(cli_get_process_title,        NULL)
+	PHP_FE(cli_get_process_title,        arginfo_cli_get_process_title)
 	{NULL, NULL, NULL}
 };
 

sapi/cli/php_cli_process_title.c

@@ -56,6 +56,10 @@ PHP_FUNCTION(cli_get_process_title)
         const char* title = NULL;
         int rc;
 
+        if (zend_parse_parameters_none() == FAILURE) {
+            return;
+        }
+
         rc = get_ps_title(&length, &title);
         if (rc != PS_TITLE_SUCCESS) {
                 php_error_docref(NULL TSRMLS_CC, E_WARNING, "cli_get_process_title had an error: %s", ps_title_errno(rc));

sapi/cli/php_cli_process_title.h

@@ -25,6 +25,9 @@ ZEND_BEGIN_ARG_INFO(arginfo_cli_set_process_title, 0)
     ZEND_ARG_INFO(0, title)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO(arginfo_cli_get_process_title, 0)
+ZEND_END_ARG_INFO()
+
 PHP_FUNCTION(cli_set_process_title);
 PHP_FUNCTION(cli_get_process_title);
 

sapi/cli/php_cli_server.c

@@ -433,7 +433,7 @@ zend_module_entry cli_server_module_entry = {
 
 const zend_function_entry server_additional_functions[] = {
 	PHP_FE(cli_set_process_title,        arginfo_cli_set_process_title)
-	PHP_FE(cli_get_process_title,        NULL)
+	PHP_FE(cli_get_process_title,        arginfo_cli_get_process_title)
 	{NULL, NULL, NULL}
 };
 

sapi/cli/ps_title.c

@@ -48,10 +48,10 @@ extern char** environ;
 #endif
 
 #ifdef HAVE_SYS_PSTAT_H
-#include <sys/pstat.h> // for HP-UX
+#include <sys/pstat.h> /* for HP-UX */
 #endif
 #ifdef HAVE_PS_STRINGS
-#include <machine/vmparam.h> // for old BSD
+#include <machine/vmparam.h> /* for old BSD */
 #include <sys/exec.h>
 #endif
 #if defined(DARWIN)
@@ -237,7 +237,7 @@ char** save_ps_args(int argc, char** argv)
 #endif /* PS_USE_CLOBBER_ARGV */
 
 #ifdef PS_USE_CHANGE_ARGV
-    save_argv[0] = ps_buffer; // ps_buffer here is a static const array of size PS_BUFFER_SIZE
+    save_argv[0] = ps_buffer; /* ps_buffer here is a static const array of size PS_BUFFER_SIZE */
     save_argv[1] = NULL;
 #endif /* PS_USE_CHANGE_ARGV */
 
@@ -265,7 +265,7 @@ char** save_ps_args(int argc, char** argv)
 int is_ps_title_available()
 {
 #ifdef PS_USE_NONE
-    return PS_TITLE_NOT_AVAILABLE; // disabled functionality
+    return PS_TITLE_NOT_AVAILABLE; /* disabled functionality */
 #endif
 
     if (!save_argv)
@@ -402,7 +402,6 @@ void cleanup_ps_args(char **argv)
 
 #ifdef PS_USE_CLOBBER_ARGV
         {
-            // clean up environ
             int i;
             for (i = 0; environ[i] != NULL; i++)
                 free(environ[i]);