commit 5f25cc858267bf6a334ed243cd4ceaa4bcb851d6
from: Stefan Sperling <stsp@stsp.name>
date: Tue Nov 26 22:43:12 2019 UTC

remove obj->path_packfile which is unused nowadays; saves a few free() calls

commit - de5fe1c2ee87a0f3ce48805f11426c38f86883db
commit + 5f25cc858267bf6a334ed243cd4ceaa4bcb851d6
blob - f09d092331780e3ebd0811893a864ed717f20689
blob + 48943370d3ef1d3481f6705b0a639bf1b63c9721
--- lib/got_lib_object.h
+++ lib/got_lib_object.h
@@ -29,7 +29,6 @@ struct got_object {
 	size_t size;
 	struct got_object_id id;
 
-	char *path_packfile;	/* if packed */
 	int pack_idx;		/* if packed */
 	off_t pack_offset;	/* if packed */
 	struct got_delta_chain deltas; /* if deltified */
blob - c6bef75ef4884567711056ca5c12f1bb477c78b1
blob + 743225bd8b0c961f03bbcb6159f3f8d46bed5ee1
--- lib/object.c
+++ lib/object.c
@@ -196,11 +196,6 @@ request_packed_object(struct got_object **obj, struct 
 	if (err)
 		return err;
 
-	(*obj)->path_packfile = strdup(pack->path_packfile);
-	if ((*obj)->path_packfile == NULL) {
-		err = got_error_from_errno("strdup");
-		return err;
-	}
 	memcpy(&(*obj)->id, id, sizeof((*obj)->id));
 
 	return NULL;
@@ -325,7 +320,7 @@ open_packed_object(struct got_object **obj, struct got
 	if (err)
 		goto done;
 
-	err = got_repo_cache_pack(NULL, repo, (*obj)->path_packfile, packidx);
+	err = got_repo_cache_pack(NULL, repo, path_packfile, packidx);
 done:
 	free(path_packfile);
 	return err;
blob - c67ff751c1fbd694ef012e6ec8f54283f24acdf3
blob + db4481bcfb84b088f08263746db7f471c549ffc8
--- lib/object_cache.c
+++ lib/object_cache.c
@@ -77,9 +77,6 @@ get_size_obj(struct got_object *obj)
 	size_t size = sizeof(*obj);
 	struct got_delta *delta;
 
-	if (obj->flags & GOT_OBJ_FLAG_PACKED)
-		size += strlen(obj->path_packfile);
-
 	if ((obj->flags & GOT_OBJ_FLAG_DELTIFIED) == 0)
 		return size;
 
blob - 912407084a50328b63f743b536ff77698ad6d979
blob + 2c6c9f86f646c392cafc86f34363217f4e2b0647
--- lib/object_parse.c
+++ lib/object_parse.c
@@ -117,8 +117,6 @@ got_object_close(struct got_object *obj)
 			free(delta);
 		}
 	}
-	if (obj->flags & GOT_OBJ_FLAG_PACKED)
-		free(obj->path_packfile);
 	free(obj);
 }
 
blob - eef27b82b6eeb8a714c5fedd79b33b04f6e8e5f5
blob + 76e93296facb5030262cde3a6498b92753b2c796
--- lib/pack.c
+++ lib/pack.c
@@ -611,20 +611,12 @@ parse_object_type_and_size(uint8_t *type, uint64_t *si
 }
 
 static const struct got_error *
-open_plain_object(struct got_object **obj, const char *path_packfile,
-    struct got_object_id *id, uint8_t type, off_t offset, size_t size, int idx)
+open_plain_object(struct got_object **obj, struct got_object_id *id,
+    uint8_t type, off_t offset, size_t size, int idx)
 {
 	*obj = calloc(1, sizeof(**obj));
 	if (*obj == NULL)
 		return got_error_from_errno("calloc");
-
-	(*obj)->path_packfile = strdup(path_packfile);
-	if ((*obj)->path_packfile == NULL) {
-		const struct got_error *err = got_error_from_errno("strdup");
-		free(*obj);
-		*obj = NULL;
-		return err;
-	}
 
 	(*obj)->type = type;
 	(*obj)->flags = GOT_OBJ_FLAG_PACKED;
@@ -919,12 +911,6 @@ open_delta_object(struct got_object **obj, struct got_
 
 	SIMPLEQ_INIT(&(*obj)->deltas.entries);
 	(*obj)->flags |= GOT_OBJ_FLAG_DELTIFIED;
-
-	(*obj)->path_packfile = strdup(pack->path_packfile);
-	if ((*obj)->path_packfile == NULL) {
-		err = got_error_from_errno("strdup");
-		goto done;
-	}
 	(*obj)->flags |= GOT_OBJ_FLAG_PACKED;
 	(*obj)->pack_idx = idx;
 
@@ -970,8 +956,8 @@ got_packfile_open_object(struct got_object **obj, stru
 	case GOT_OBJ_TYPE_TREE:
 	case GOT_OBJ_TYPE_BLOB:
 	case GOT_OBJ_TYPE_TAG:
-		err = open_plain_object(obj, pack->path_packfile, id, type,
-		    offset + tslen, size, idx);
+		err = open_plain_object(obj, id, type, offset + tslen,
+		    size, idx);
 		break;
 	case GOT_OBJ_TYPE_OFFSET_DELTA:
 	case GOT_OBJ_TYPE_REF_DELTA: