Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=345e3fdbd619795045454c0447f0f538bdb7d11c
commit 345e3fdbd619795045454c0447f0f538bdb7d11c Author: Michel Hermier <[email protected]> Date: Thu Apr 24 08:43:18 2014 +0200 libpacman: Some renaming. diff --git a/lib/libpacman/object.c b/lib/libpacman/object.c index 94d4eaa..5b31a75 100644 --- a/lib/libpacman/object.c +++ b/lib/libpacman/object.c @@ -96,15 +96,15 @@ int _pacman_object_set(struct __pmobject_t *self, unsigned val, unsigned long da return object_operations->set(self, val, data); } -struct __pmobject_t *_pacman_objectmemory_alloc(size_t size, const struct __pmobject_operations_t *operations) +struct __pmobject_t *_pacman_objectmemory_alloc(size_t size, const struct __pmobject_operations_t *object_operations) { struct __pmobject_t *ret; ASSERT(size >= sizeof(*ret), RET_ERR(PM_ERR_WRONG_ARGS, NULL)); - ASSERT(operations != NULL, RET_ERR(PM_ERR_WRONG_ARGS, NULL)); + ASSERT(object_operations != NULL, RET_ERR(PM_ERR_WRONG_ARGS, NULL)); if((ret = f_zalloc(size)) != NULL) { - ret->operations = operations; + ret->operations = object_operations; } return ret; } diff --git a/lib/libpacman/object.h b/lib/libpacman/object.h index ec396d5..a24c6dc 100644 --- a/lib/libpacman/object.h +++ b/lib/libpacman/object.h @@ -53,7 +53,7 @@ const struct __pmobject_operations_t *_pacman_object_operations(struct __pmobjec int _pacman_object_get(struct __pmobject_t *self, unsigned val, unsigned long *data); int _pacman_object_set(struct __pmobject_t *self, unsigned val, unsigned long data); -struct __pmobject_t *_pacman_objectmemory_alloc(size_t size, const struct __pmobject_operations_t *operations); +struct __pmobject_t *_pacman_objectmemory_alloc(size_t size, const struct __pmobject_operations_t *object_operations); #endif /* _PACMAN__OBJECT_H */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
