Skip to content

Commit a69b353

Browse files
committed
phar: Re-indent code
1 parent 6291f97 commit a69b353

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

ext/phar/dirstream.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -198,25 +198,25 @@ static php_stream *phar_make_dirstream(const char *dir, size_t dirlen, const Has
198198
}
199199
}
200200

201-
const char *save = ZSTR_VAL(str_key);
202-
save += dirlen + 1; /* seek to just past the path separator */
203-
204-
const char *has_slash = memchr(save, '/', keylen - dirlen - 1);
205-
if (has_slash) {
206-
/* is subdirectory */
207-
save -= dirlen + 1;
208-
entry = safe_emalloc(has_slash - save + dirlen, 1, 1);
209-
memcpy(entry, save + dirlen + 1, has_slash - save - dirlen - 1);
210-
keylen = has_slash - save - dirlen - 1;
211-
entry[keylen] = '\0';
212-
} else {
213-
/* is file */
214-
save -= dirlen + 1;
215-
entry = safe_emalloc(keylen - dirlen, 1, 1);
216-
memcpy(entry, save + dirlen + 1, keylen - dirlen - 1);
217-
entry[keylen - dirlen - 1] = '\0';
218-
keylen = keylen - dirlen - 1;
219-
}
201+
const char *save = ZSTR_VAL(str_key);
202+
save += dirlen + 1; /* seek to just past the path separator */
203+
204+
const char *has_slash = memchr(save, '/', keylen - dirlen - 1);
205+
if (has_slash) {
206+
/* is subdirectory */
207+
save -= dirlen + 1;
208+
entry = safe_emalloc(has_slash - save + dirlen, 1, 1);
209+
memcpy(entry, save + dirlen + 1, has_slash - save - dirlen - 1);
210+
keylen = has_slash - save - dirlen - 1;
211+
entry[keylen] = '\0';
212+
} else {
213+
/* is file */
214+
save -= dirlen + 1;
215+
entry = safe_emalloc(keylen - dirlen, 1, 1);
216+
memcpy(entry, save + dirlen + 1, keylen - dirlen - 1);
217+
entry[keylen - dirlen - 1] = '\0';
218+
keylen = keylen - dirlen - 1;
219+
}
220220
}
221221

222222
if (keylen) {

0 commit comments

Comments
 (0)