com php-src: Remove unused variables: ext/iconv/iconv.c sapi/litespeed/lscriu.c
| From: | Peter Kokot | Date: | Fri, 10 May 2019 20:58:14 +0000 |
| Subject: | com php-src: Remove unused variables: ext/iconv/iconv.c sapi/litespeed/lscriu.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106119@lists.php.net to get a copy of this message | ||
Commit: 313930a36a3a3d73836e860a54311f4b5742cba5
Author: Peter Kokot <peterkokot@gmail.com> Fri, 10 May 2019 04:02:14 +0200
Parents: 1b0a33ec5998cde179e768751f06a691dd157580
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=313930a36a3a3d73836e860a54311f4b5742cba5
Log:
Remove unused variables
Changed paths:
M ext/iconv/iconv.c
M sapi/litespeed/lscriu.c
Diff:
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 7e8852c..f064b652 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv..c
@@ -540,7 +540,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len,
char *out_p;
iconv_t cd;
size_t result;
- zend_string *ret, *out_buffer;
+ zend_string *out_buffer;
*out = NULL;
diff --git a/sapi/litespeed/lscriu.c b/sapi/litespeed/lscriu.c
index 9fa1de2..7c5bda7 100644
--- a/sapi/litespeed/lscriu.c
+++ b/sapi/litespeed/lscriu.c
@@ -142,12 +142,6 @@ typedef struct
char m_chServiceAddress[SUN_PATH_MAX];
} criu_native_dump_t;
-typedef struct
-{
- int m_iDumpResult;
- char m_chDumpResponseMessage[1024];
-} criu_native_dump_response_t;
-
typedef sem_t * (*psem_open_t) (const char *__name, int __oflag, ...);
typedef int (*psem_post_t) (sem_t *__sem);
typedef int (*psem_close_t) (sem_t *__sem);
@@ -421,7 +415,6 @@ static int LSCRIU_Native_Dump(pid_t iPid,
int iFdNative) {
criu_native_dump_t criu_native_dump;
char *pchLastSlash;
- criu_native_dump_response_t criu_native_dump_response;
memset(&criu_native_dump, 0, sizeof(criu_native_dump));
criu_native_dump.m_iPidToDump = iPid;
@@ -441,18 +434,6 @@ static int LSCRIU_Native_Dump(pid_t iPid,
return(-1);
}
return 0;
- /* do not wait response.
- //while (sleep(7200));
- if (read(iFdNative,
- &criu_native_dump_response,
- sizeof(criu_native_dump_response)) == -1) {
- // The test will actually fail it!
- //LSCRIU_Restored_Error(1, "Error reading dump socket #%d from parent: %s",
- // iFdNative, strerror(errno));
- //return(-1);
- }
- return(-1);
- */
}