summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2021-01-05 01:36:09 +0100
committerAllan McRae <allan@archlinux.org>2021-01-08 15:15:04 +0100
commit1d2dd9a128690cef754bc102605df4918a508848 (patch)
tree70c11423075035e0b7f62fdce9fcdf73e1ca8b4a
parentf8614d8c5be0f58db8e14092a387ff6ffbf209d7 (diff)
downloadpacman-1d2dd9a128690cef754bc102605df4918a508848.tar.gz
pacman-1d2dd9a128690cef754bc102605df4918a508848.tar.xz
libalpm: const annotate struct pkg_operations
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--lib/libalpm/be_local.c2
-rw-r--r--lib/libalpm/be_package.c2
-rw-r--r--lib/libalpm/be_sync.c2
-rw-r--r--lib/libalpm/package.c2
-rw-r--r--lib/libalpm/package.h4
5 files changed, 6 insertions, 6 deletions
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index e73a97bb..9c3c8bb3 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -326,7 +326,7 @@ static int _cache_force_load(alpm_pkg_t *pkg)
* lazy accessor methods that handle any backend loading and caching
* logic.
*/
-static struct pkg_operations local_pkg_ops = {
+static const struct pkg_operations local_pkg_ops = {
.get_base = _cache_get_base,
.get_desc = _cache_get_desc,
.get_url = _cache_get_url,
diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c
index 5b2e5274..9429ad53 100644
--- a/lib/libalpm/be_package.c
+++ b/lib/libalpm/be_package.c
@@ -137,7 +137,7 @@ static int _package_changelog_close(const alpm_pkg_t UNUSED *pkg, void *fp)
* because we want to reuse the majority of the default_pkg_ops struct and
* add only a few operations of our own on top.
*/
-static struct pkg_operations *get_file_pkg_ops(void)
+static const struct pkg_operations *get_file_pkg_ops(void)
{
static struct pkg_operations file_pkg_ops;
static int file_pkg_ops_initialized = 0;
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
index 37000dec..0a5cb7c2 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -285,7 +285,7 @@ static int _sync_get_validation(alpm_pkg_t *pkg)
* because we want to reuse the majority of the default_pkg_ops struct and
* add only a few operations of our own on top.
*/
-static struct pkg_operations *get_sync_pkg_ops(void)
+static const struct pkg_operations *get_sync_pkg_ops(void)
{
static struct pkg_operations sync_pkg_ops;
static int sync_pkg_ops_initalized = 0;
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index a4356518..5766c600 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -138,7 +138,7 @@ static int _pkg_force_load(alpm_pkg_t UNUSED *pkg) { return 0; }
/** The standard package operations struct. Get fields directly from the
* struct itself with no abstraction layer or any type of lazy loading.
*/
-struct pkg_operations default_pkg_ops = {
+const struct pkg_operations default_pkg_ops = {
.get_base = _pkg_get_base,
.get_desc = _pkg_get_desc,
.get_url = _pkg_get_url,
diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h
index c37bd11e..b134ad5a 100644
--- a/lib/libalpm/package.h
+++ b/lib/libalpm/package.h
@@ -83,7 +83,7 @@ struct pkg_operations {
* The actual definition is in package.c so it can have access to the
* default accessor functions which are defined there.
*/
-extern struct pkg_operations default_pkg_ops;
+extern const struct pkg_operations default_pkg_ops;
struct __alpm_pkg_t {
unsigned long name_hash;
@@ -121,7 +121,7 @@ struct __alpm_pkg_t {
alpm_list_t *removes; /* in transaction targets only */
alpm_pkg_t *oldpkg; /* in transaction targets only */
- struct pkg_operations *ops;
+ const struct pkg_operations *ops;
alpm_filelist_t files;