]> granicus.if.org Git - php/commitdiff
Remove unused variables
authorPeter Kokot <peterkokot@gmail.com>
Fri, 10 May 2019 02:02:14 +0000 (04:02 +0200)
committerPeter Kokot <peterkokot@gmail.com>
Fri, 10 May 2019 20:58:14 +0000 (22:58 +0200)
ext/iconv/iconv.c
sapi/litespeed/lscriu.c

index 7e8852cc47019ce41a2f81730e1dddb0df43e095..f064b652909ec848e25ae342986b463eaa994a6c 100644 (file)
@@ -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;
 
index 9fa1de22c5f8594c1617f602a3c339caa2364688..7c5bda7e8865260019ba9df777c0b21b81041638 100644 (file)
@@ -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);
-    */
 }