archive-tar: unindent write_tar_entry by one level
It's used to be if (!sha1) { ... } else if (!path) { ... } else { ... } Now that the first two blocks are no-op. We can remove the if/else skeleton and put the else block back by one indent level. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
May 3, 2012 at 08:51 UTC
853907097af803c595f0c12fc355c907702eb7c8
1 file changed
+25
-31
archive-tar.c
+25
-31
@@ -170,40 +170,34 @@ static int write_tar_entry(struct archiver_args *args,
170
171
memset(&header, 0, sizeof(header));
172
173
- if (!sha1) {
174
- die("BUG: sha1 == NULL is not supported");
175
- } else if (!path) {
176
- die("BUG: path == NULL is not supported");
173
+ if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
174
+ *header.typeflag = TYPEFLAG_DIR;
175
+ mode = (mode | 0777) & ~tar_umask;
176
+ } else if (S_ISLNK(mode)) {
177
+ *header.typeflag = TYPEFLAG_LNK;
178
+ mode |= 0777;
179
+ } else if (S_ISREG(mode)) {
180
+ *header.typeflag = TYPEFLAG_REG;
181
+ mode = (mode | ((mode & 0100) ? 0777 : 0666)) & ~tar_umask;
182
} else {
178
- if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
179
- *header.typeflag = TYPEFLAG_DIR;
180
- mode = (mode | 0777) & ~tar_umask;
181
- } else if (S_ISLNK(mode)) {
182
- *header.typeflag = TYPEFLAG_LNK;
183
- mode |= 0777;
184
- } else if (S_ISREG(mode)) {
185
- *header.typeflag = TYPEFLAG_REG;
186
- mode = (mode | ((mode & 0100) ? 0777 : 0666)) & ~tar_umask;
183
+ return error("unsupported file mode: 0%o (SHA1: %s)",
184
+ mode, sha1_to_hex(sha1));
185
+ }
186
+ if (pathlen > sizeof(header.name)) {
187
+ size_t plen = get_path_prefix(path, pathlen,
188
+ sizeof(header.prefix));
189
+ size_t rest = pathlen - plen - 1;
190
+ if (plen > 0 && rest <= sizeof(header.name)) {
191
+ memcpy(header.prefix, path, plen);
192
+ memcpy(header.name, path + plen + 1, rest);
193
} else {
188
- return error("unsupported file mode: 0%o (SHA1: %s)",
189
- mode, sha1_to_hex(sha1));
194
+ sprintf(header.name, "%s.data",
195
+ sha1_to_hex(sha1));
196
+ strbuf_append_ext_header(&ext_header, "path",
197
+ path, pathlen);
198
}
191
- if (pathlen > sizeof(header.name)) {
192
- size_t plen = get_path_prefix(path, pathlen,
193
- sizeof(header.prefix));
194
- size_t rest = pathlen - plen - 1;
195
- if (plen > 0 && rest <= sizeof(header.name)) {
196
- memcpy(header.prefix, path, plen);
197
- memcpy(header.name, path + plen + 1, rest);
198
- } else {
199
- sprintf(header.name, "%s.data",
200
- sha1_to_hex(sha1));
201
- strbuf_append_ext_header(&ext_header, "path",
202
- path, pathlen);
203
- }
204
- } else
205
- memcpy(header.name, path, pathlen);
206
- }
199
+ } else
200
+ memcpy(header.name, path, pathlen);
201
202
if (S_ISLNK(mode) && buffer) {
203
if (size > sizeof(header.linkname)) {