8e8f220 No need for a double linked list for files, messages and directories — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

No need for a double linked list for files, messages and directories

Baptiste Daroussin committed 9 years ago

commit 8e8f220f56832a521bcdbfc824cd6893c6f0d830
parent 5ec313d

2 files changed +5 -8

modified libpkg/pkg.c

@@ -734,7 +734,7 @@ pkg_addfile_attr(struct pkg *pkg, const char *path, const char *sum,

 		f->fflags = fflags;
 	kh_safe_add(pkg_files, pkg->filehash, f, f->path);
 	DL_APPEND(pkg->files, f);
 	LL_APPEND(pkg->files, f);
 	return (EPKG_OK);
 }

@@ -841,7 +841,7 @@ pkg_adddir_attr(struct pkg *pkg, const char *path, const char *uname,

 		d->fflags = fflags;
 	kh_safe_add(pkg_dirs, pkg->dirhash, d, d->path);
 	DL_APPEND(pkg->dirs, d);
 	LL_APPEND(pkg->dirs, d);
 	return (EPKG_OK);
 }

@@ -1812,7 +1812,7 @@ pkg_message_from_ucl(struct pkg *pkg, const ucl_object_t *obj)

 		}
 		msg->str = strdup(ucl_object_tostring(obj));
 		msg->type = PKG_MESSAGE_ALWAYS;
 		DL_APPEND(pkg->message, msg);
 		LL_APPEND(pkg->message, msg);
 		return (EPKG_OK);
 	}

@@ -1853,7 +1853,7 @@ pkg_message_from_ucl(struct pkg *pkg, const ucl_object_t *obj)

 				    " message will always be printed");
 		}
 		if (msg->type != PKG_MESSAGE_UPGRADE) {
 			DL_APPEND(pkg->message, msg);
 			LL_APPEND(pkg->message, msg);
 			continue;
 		}

@@ -1867,7 +1867,7 @@ pkg_message_from_ucl(struct pkg *pkg, const ucl_object_t *obj)

 			msg->maximum_version = strdup(ucl_object_tostring(elt));
 		}
 		DL_APPEND(pkg->message, msg);
 		LL_APPEND(pkg->message, msg);
 	}
 	return (EPKG_OK);

modified libpkg/private/pkg.h

@@ -319,7 +319,6 @@ struct pkg_message {

 	char			*minimum_version;
 	char			*maximum_version;
 	pkg_message_t		 type;
 	struct pkg_message	*prev;
 	struct pkg_message	*next;
 };

@@ -362,7 +361,6 @@ struct pkg_file {

 	char		 temppath[MAXPATHLEN];
 	u_long		 fflags;
 	struct pkg_config_file *config;
 	struct pkg_file	*prev;
 	struct pkg_file	*next;
 };

@@ -376,7 +374,6 @@ struct pkg_dir {

 	gid_t		 gid;
 	bool		 noattrs;
 	struct timespec	 time[2];
 	struct pkg_dir	*prev;
 	struct pkg_dir	*next;
 };