bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor struct member reordering for packing concerns

Browse source 
Noticed using clang and `-Wpadded`.

Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Dan McGee 2014-01-02 12:37:08 -06:00 • committed by Allan McRae
parent 086bbc5b62
commit 30740d9d2f
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/libalpm/dload.h
View file

@ -31,6 +31,8 @@ struct dload_payload {
char *destfile_name; char *destfile_name;
char *content_disp_name; char *content_disp_name;
char *fileurl; char *fileurl;
alpm_list_t *servers;
long respcode;
off_t initial_size; off_t initial_size;
off_t max_size; off_t max_size;
off_t prevprogress; off_t prevprogress;
@ -39,11 +41,9 @@ struct dload_payload {
int errors_ok; int errors_ok;
int unlink_on_fail; int unlink_on_fail;
int trust_remote_name; int trust_remote_name;
alpm_list_t *servers;
#ifdef HAVE_LIBCURL #ifdef HAVE_LIBCURL
CURLcode curlerr; /* last error produced by curl */ CURLcode curlerr; /* last error produced by curl */
#endif #endif
long respcode;
}; };
void _alpm_dload_payload_reset(struct dload_payload *payload); void _alpm_dload_payload_reset(struct dload_payload *payload);

4
lib/libalpm/graph.h
View file

@ -24,12 +24,12 @@
#include "alpm_list.h" #include "alpm_list.h"
typedef struct __alpm_graph_t { typedef struct __alpm_graph_t {
char state; /* 0: untouched, -1: entered, other: leaving time */
off_t weight; /* weight of the node */
void *data; void *data;
struct __alpm_graph_t *parent; /* where did we come from? */ struct __alpm_graph_t *parent; /* where did we come from? */
alpm_list_t *children; alpm_list_t *children;
alpm_list_t *childptr; /* points to a child in children list */ 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_t *_alpm_graph_new(void); alpm_graph_t *_alpm_graph_new(void);

4
lib/libalpm/handle.h
View file

@ -55,7 +55,6 @@ struct __alpm_handle_t {
alpm_db_t *db_local; /* local db pointer */ alpm_db_t *db_local; /* local db pointer */
alpm_list_t *dbs_sync; /* List of (alpm_db_t *) */ alpm_list_t *dbs_sync; /* List of (alpm_db_t *) */
FILE *logstream; /* log file stream pointer */ FILE *logstream; /* log file stream pointer */
int lockfd; /* lock file descriptor */
alpm_trans_t *trans; alpm_trans_t *trans;
#ifdef HAVE_LIBCURL #ifdef HAVE_LIBCURL
@ -100,6 +99,9 @@ struct __alpm_handle_t {
/* error code */ /* error code */
alpm_errno_t pm_errno; alpm_errno_t pm_errno;
/* lock file descriptor */
int lockfd;
/* for delta parsing efficiency */ /* for delta parsing efficiency */
int delta_regex_compiled; int delta_regex_compiled;
regex_t delta_regex; regex_t delta_regex;

2
src/pacman/conf.c
View file

@ -746,8 +746,8 @@ struct section_t {
int is_options; int is_options;
int parse_options; int parse_options;
/* db section option gathering */ /* db section option gathering */
alpm_siglevel_t siglevel;
alpm_list_t *servers; alpm_list_t *servers;
alpm_siglevel_t siglevel;
alpm_db_usage_t usage; alpm_db_usage_t usage;
}; };