Cleanup unpack_object_header to use only offsets.

diff --git a/server-info.c b/server-info.c
index 6089765941f36712ec6ee54e5b1492b8c707917b..7df628f2b226f6984d168af0382680b9dae0751a 100644 (file)
--- a/server-info.c
+++ b/server-info.c
@@ -12,7 +12,7 @@ static int add_info_ref(const char *path, const unsigned char *sha1)
        struct object *o = parse_object(sha1);
 
        fprintf(info_ref_fp, "%s        %s\n", sha1_to_hex(sha1), path);
-       if (o->type == tag_type) {
+       if (o->type == OBJ_TAG) {
                o = deref_tag(o, path, 0);
                if (o)
                        fprintf(info_ref_fp, "%s        %s^{}\n",
@@ -94,12 +94,15 @@ static int read_pack_info_file(const char *infofile)
 
        fp = fopen(infofile, "r");
        if (!fp)
-               return 1; /* nonexisting is not an error. */
+               return 1; /* nonexistent is not an error. */
 
        while (fgets(line, sizeof(line), fp)) {
                int len = strlen(line);
                if (line[len-1] == '\n')
-                       line[len-1] = 0;
+                       line[--len] = 0;
+
+               if (!len)
+                       continue;
 
                switch (line[0]) {
                case 'P': /* P name */