From 606f67b4394f2b51de5f02ae16aab585b3107fd0 Mon Sep 17 00:00:00 2001 From: Maxime ROUX Date: Thu, 17 Feb 2022 14:12:54 +0100 Subject: [PATCH 1/2] Fixed missing prototype for macOS --- php_proctitle.h | 5 ++++- proctitle.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/php_proctitle.h b/php_proctitle.h index 6738b4f..105024e 100644 --- a/php_proctitle.h +++ b/php_proctitle.h @@ -26,9 +26,12 @@ extern zend_module_entry proctitle_module_entry; #define phpext_proctitle_ptr &proctitle_module_entry +void php_info_print_table_start(void); +void php_info_print_table_header(int num_cols, ...); +void php_info_print_table_end(void); + PHP_MINIT_FUNCTION(proctitle); PHP_MINFO_FUNCTION(proctitle); - PHP_FUNCTION(setproctitle); #endif /* PHP_PROCTITLE_H */ diff --git a/proctitle.c b/proctitle.c index b9b80ee..a4a075c 100644 --- a/proctitle.c +++ b/proctitle.c @@ -41,7 +41,7 @@ static void setproctitle(char *title, int tlen) { char buffer[MAX_TITLE_LENGTH]; - if(!argv0) { + if (!argv0) { return; /* no point running all this if we got no argv0 */ } @@ -63,7 +63,7 @@ PHP_MINIT_FUNCTION(proctitle) symbol = &sapi_module; - if( symbol ) + if (symbol) argv0 = symbol->executable_location; } #endif From b2cff0c0162281e0f8fd60c00bfeb44f43b44ca5 Mon Sep 17 00:00:00 2001 From: Maxime ROUX Date: Mon, 18 Nov 2024 18:05:32 +0100 Subject: [PATCH 2/2] Trailing lines --- LICENSE | 26 +++++++++++++------------- php_proctitle.h | 2 +- proctitle.c | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/LICENSE b/LICENSE index 249cbc9..89a32f1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ --------------------------------------------------------------------- +-------------------------------------------------------------------- The PHP License, version 3.01 Copyright (c) 1999 - 2009 The PHP Group. All rights reserved. --------------------------------------------------------------------- +-------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following conditions @@ -9,22 +9,22 @@ are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. 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. - + 3. The name "PHP" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact group@php.net. - + 4. Products derived from this software may not be called "PHP", nor may "PHP" appear in their name, without prior written permission from group@php.net. You may indicate that your software works in conjunction with PHP by saying "Foo for PHP" instead of calling it "PHP Foo" or "phpfoo" - + 5. The PHP Group may publish revised and/or new versions of the license from time to time. Each version will be given a distinguishing version number. @@ -41,27 +41,27 @@ are met: "This product includes PHP software, freely available from ". -THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND +THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP -DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +DEVELOPMENT TEAM OR ITS 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. --------------------------------------------------------------------- +-------------------------------------------------------------------- This software consists of voluntary contributions made by many individuals on behalf of the PHP Group. The PHP Group can be contacted via Email at group@php.net. -For more information on the PHP Group and the PHP project, +For more information on the PHP Group and the PHP project, please see . PHP includes the Zend Engine, freely available at diff --git a/php_proctitle.h b/php_proctitle.h index 105024e..9a0527b 100644 --- a/php_proctitle.h +++ b/php_proctitle.h @@ -15,7 +15,7 @@ | Author: | +----------------------------------------------------------------------+ - $Id$ + $Id$ */ #ifndef PHP_PROCTITLE_H diff --git a/proctitle.c b/proctitle.c index a4a075c..8913044 100644 --- a/proctitle.c +++ b/proctitle.c @@ -15,7 +15,7 @@ | Author: | +----------------------------------------------------------------------+ - $Id$ + $Id$ */ #ifdef HAVE_CONFIG_H