]> granicus.if.org Git - php/commitdiff
Cleanup
authorSascha Schumann <sas@php.net>
Thu, 16 Mar 2000 19:19:14 +0000 (19:19 +0000)
committerSascha Schumann <sas@php.net>
Thu, 16 Mar 2000 19:19:14 +0000 (19:19 +0000)
main/php_virtual_cwd.c

index 31c4368885e0d43cf70689a690dc1957606c136b..85dcb170ead7be16dbf2b95107631a8706b6a413 100644 (file)
@@ -149,7 +149,7 @@ int virtual_chdir(cwd_state *state, char *path)
        }
 
        if (copy_amount != -1) {
-               state->cwd = realloc(state->cwd, copy_amount + 1);
+               state->cwd = (char *) realloc(state->cwd, copy_amount + 1);
                if (copy_amount)
                        memcpy(state->cwd, old_state->cwd, copy_amount);
                state->cwd[copy_amount] = '\0';
@@ -219,11 +219,10 @@ void main(void)
                state.cwd_length <<= 1;
                state.cwd = realloc(state.cwd, state.cwd_length + 1);
        }
-       state.cwd_length = strlen(state.cwd);
 #else
        state.cwd = strdup("d:\\foo\\bar");
-       state.cwd_length = strlen(state.cwd);
 #endif
+       state.cwd_length = strlen(state.cwd);
 
 #define T(a) \
        printf("[%s] $ cd %s\n", virtual_getcwd(&state, &length), a); \