On 03/01/14 04:37, Dan McGee wrote: > Noticed using clang and `-Wpadded`.
Should that be added in our --enable-warning-flags option? > Signed-off-by: Dan McGee <[email protected]> > --- > lib/libalpm/dload.h | 4 ++-- > lib/libalpm/graph.h | 4 ++-- > lib/libalpm/handle.h | 4 +++- > 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 6c9f7a7..964c338 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 bf06047..8db35bf 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 4126e1a..b6b8e2b 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 cf8a417..258d538 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; > }; > >
