diff options
| author | Dan McGee <dan@archlinux.org> | 2014-01-02 12:37:08 -0600 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-01-06 14:38:50 +1000 |
| commit | 30740d9d2fd859cbfa214a8bb3236ba73dedf159 (patch) | |
| tree | ed96e6c4752fd2d9019ea2700896a27d9500f35d | |
| parent | 086bbc5b623d08df9ffe595bd5ee965e668a4ae1 (diff) | |
| download | pacman-30740d9d2fd859cbfa214a8bb3236ba73dedf159.tar.xz | |
Minor struct member reordering for packing concerns
Noticed using clang and `-Wpadded`.
Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | lib/libalpm/dload.h | 4 | ||||
| -rw-r--r-- | lib/libalpm/graph.h | 4 | ||||
| -rw-r--r-- | lib/libalpm/handle.h | 4 | ||||
| -rw-r--r-- | src/pacman/conf.c | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index e2c85af8..113414c5 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -31,6 +31,8 @@ struct dload_payload { char *destfile_name; char *content_disp_name; char *fileurl; + alpm_list_t *servers; + long respcode; off_t initial_size; off_t max_size; off_t prevprogress; @@ -39,11 +41,9 @@ struct dload_payload { int errors_ok; int unlink_on_fail; int trust_remote_name; - alpm_list_t *servers; #ifdef HAVE_LIBCURL CURLcode curlerr; /* last error produced by curl */ #endif - long respcode; }; void _alpm_dload_payload_reset(struct dload_payload *payload); diff --git a/lib/libalpm/graph.h b/lib/libalpm/graph.h index 25605bef..f4045f5a 100644 --- a/lib/libalpm/graph.h +++ b/lib/libalpm/graph.h @@ -24,12 +24,12 @@ #include "alpm_list.h" typedef struct __alpm_graph_t { - char state; /* 0: untouched, -1: entered, other: leaving time */ - off_t weight; /* weight of the node */ void *data; struct __alpm_graph_t *parent; /* where did we come from? */ alpm_list_t *children; alpm_list_t *childptr; /* points to a child in children list */ + off_t weight; /* weight of the node */ + char state; /* 0: untouched, -1: entered, other: leaving time */ } alpm_graph_t; alpm_graph_t *_alpm_graph_new(void); diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 402e4146..fcfd4fad 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -55,7 +55,6 @@ struct __alpm_handle_t { alpm_db_t *db_local; /* local db pointer */ alpm_list_t *dbs_sync; /* List of (alpm_db_t *) */ FILE *logstream; /* log file stream pointer */ - int lockfd; /* lock file descriptor */ alpm_trans_t *trans; #ifdef HAVE_LIBCURL @@ -100,6 +99,9 @@ struct __alpm_handle_t { /* error code */ alpm_errno_t pm_errno; + /* lock file descriptor */ + int lockfd; + /* for delta parsing efficiency */ int delta_regex_compiled; regex_t delta_regex; diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 02de1f0d..5450f3b3 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -746,8 +746,8 @@ struct section_t { int is_options; int parse_options; /* db section option gathering */ - alpm_siglevel_t siglevel; alpm_list_t *servers; + alpm_siglevel_t siglevel; alpm_db_usage_t usage; }; |