Skip to content

Commit

Permalink
sysutils/pecl-proctitle: Fix warnings with php8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
fsmeets committed Dec 13, 2022
1 parent c2bd161 commit 3d14040
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 29 deletions.
2 changes: 1 addition & 1 deletion sysutils/pecl-proctitle/Makefile
@@ -1,6 +1,6 @@
PORTNAME= proctitle
PORTVERSION= 0.1.2
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= sysutils pear

MAINTAINER= flo@FreeBSD.org
Expand Down
5 changes: 2 additions & 3 deletions sysutils/pecl-proctitle/files/patch-php__proctitle.h
@@ -1,10 +1,9 @@
--- php_proctitle.h.orig 2012-05-11 08:49:30 UTC
--- php_proctitle.h.orig 2022-12-11 12:46:56 UTC
+++ php_proctitle.h
@@ -21,6 +21,15 @@
@@ -21,6 +21,14 @@
#ifndef PHP_PROCTITLE_H
#define PHP_PROCTITLE_H

+
+#if PHP_MAJOR_VERSION >= 8
+#define TSRMLS_CC
+#define TSRMLS_C
Expand Down
49 changes: 24 additions & 25 deletions sysutils/pecl-proctitle/files/patch-proctitle.c
@@ -1,30 +1,29 @@
--- proctitle.c.orig 2012-05-11 08:49:30 UTC
--- proctitle.c.orig 2022-12-11 12:38:30 UTC
+++ proctitle.c
@@ -23,6 +23,7 @@
@@ -69,7 +69,11 @@ PHP_MINIT_FUNCTION(proctitle)
}
#endif

#include <php.h>
+#include "ext/standard/info.h"
#include <SAPI.h>
#include <dlfcn.h>
#include <string.h>
@@ -138,9 +139,7 @@ PHP_MINFO_FUNCTION(proctitle)
/* {{{ proctitle_module_entry
-/* {{{ proto void setproctitle(string title)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_title, 0, 0, 1)
+ ZEND_ARG_INFO(0, title)
+ZEND_END_ARG_INFO()
+
+/*
* Changes the current process' title in system's list of processes
*/
zend_module_entry proctitle_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
STANDARD_MODULE_HEADER,
-#endif
"proctitle",
proctitle_functions,
#ifndef PHP_SYSTEM_PROVIDES_SETPROCTITLE
@@ -152,9 +151,7 @@ zend_module_entry proctitle_module_entry = {
NULL,
NULL,
PHP_MINFO(proctitle),
-#if ZEND_MODULE_API_NO >= 20010901
PHP_PROCTITLE_VERSION,
-#endif
STANDARD_MODULE_PROPERTIES
PHP_FUNCTION(setproctitle)
@@ -117,10 +121,10 @@ PHP_FUNCTION(setthreadtitle)
*
* Every user visible function must have an entry in proctitle_functions[].
*/
-static zend_function_entry proctitle_functions[] = {
- PHP_FE(setproctitle, NULL)
+static const zend_function_entry proctitle_functions[] = {
+ PHP_FE(setproctitle, arginfo_title)
#if HAVE_PRCTL
- PHP_FE(setthreadtitle, NULL)
+ PHP_FE(setthreadtitle, arginfo_title)
#endif
{NULL, NULL, NULL} /* Must be the last line in proctitle_functions[] */
};
/* }}} */

0 comments on commit 3d14040

Please sign in to comment.