diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-03-12 13:26:54 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-03-12 13:26:54 +0200 |
| commit | 293108d7806aa3c0c5e706237b3788b261779e66 (patch) | |
| tree | f3ea5c3419c5de0284da68f1d1b6002933e02a73 /src/wydawca.h | |
| parent | 02c6a0ad553ad51f91af9d9e6c28f2529e759305 (diff) | |
| download | wydawca-293108d7806aa3c0c5e706237b3788b261779e66.tar.gz wydawca-293108d7806aa3c0c5e706237b3788b261779e66.tar.bz2 | |
Improve triplet API.
* src/wydawca.h (uploader_info): Rename to wy_user.
(file_triplet) <uploader_count>: Remove.
<admin_list>: New member.
(triplet_get_uploaders,triplet_get_uploader)
(triplet_get_admins): New protos.
* src/triplet.c (wy_user_create)
(wy_userlist_free): New static functions.
(hash_triplet_free): Use wy_userlist_free.
(triplet_get_uploaders,triplet_get_uploader)
(triplet_get_admins): New functions.
* src/verify.c (verify_directive_file): Rewrite using
triplet_get_uploaders.
* src/gpg.c (verify_directive_signature): Call triplet_get_uploaders
to initialize the uploaders list.
* modules/mailutils/mod_mailutils.c (get_recipient): Remove.
(get_owner_address): New function. All callers updated.
Remove useless const qualifiers.
Diffstat (limited to 'src/wydawca.h')
| -rw-r--r-- | src/wydawca.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/wydawca.h b/src/wydawca.h index 1948e75..bec8666 100644 --- a/src/wydawca.h +++ b/src/wydawca.h @@ -152,8 +152,8 @@ struct file_info { struct stat sb; }; -struct uploader_info { - struct uploader_info *next; +struct wy_user { + struct wy_user *next; char *name; char *realname; char *email; @@ -189,9 +189,10 @@ struct file_triplet { job and jq_prev, jq_next are NULL. */ struct job *job; /* User data */ - size_t uploader_count; - struct uploader_info *uploader_list; - struct uploader_info *uploader; + struct wy_user *uploader_list; + struct wy_user *uploader; + /* Admin data */ + struct wy_user *admin_list; /* Special data for template formatting */ char *project; /* Triplet project name (if known) */ int check_result; /* Result of external check */ @@ -460,6 +461,11 @@ void spool_commit_triplets(struct spool *, struct file_triplet *); struct file_triplet *link_processable_triplets(void); size_t count_collected_triplets(void); +struct wy_user *triplet_get_uploaders(struct file_triplet *trp); +struct wy_user *triplet_get_admins(struct file_triplet *trp); + +struct wy_user *triplet_get_uploader(struct file_triplet *trp); + char *triplet_expand_param(const char *tmpl, struct file_triplet const *trp, struct metadef *xmeta); char *triplet_expand_dictionary_query(struct dictionary *dict, void *handle, @@ -493,7 +499,7 @@ int verify_directive_file(struct file_triplet *trp, int noath); int verify_directive_signature(struct file_triplet *trp); int verify_detached_signature(struct file_triplet *trp); int fill_project_name(struct file_triplet *trp); -struct uploader_info *uploader_find_frp(struct uploader_info *list, +struct wy_user *uploader_find_frp(struct wy_user *list, const char *frp); /* Directive file support */ |