1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

Alignment tidying.

This commit is contained in:
Alasdair Kergon 2005-04-06 13:47:41 +00:00
parent 4a0623f909
commit 1165258cda
8 changed files with 16 additions and 13 deletions

View File

@ -1,5 +1,6 @@
Version 2.01.10 - Version 2.01.10 -
================================ ================================
Alignment tidying.
Version 2.01.09 - 4th April 2005 Version 2.01.09 - 4th April 2005
================================ ================================

View File

@ -36,9 +36,10 @@ struct volume_group;
struct lvmcache_vginfo { struct lvmcache_vginfo {
struct list list; /* Join these vginfos together */ struct list list; /* Join these vginfos together */
struct list infos; /* List head for lvmcache_infos */ struct list infos; /* List head for lvmcache_infos */
const struct format_type *fmt;
char *vgname; /* "" == orphan */ char *vgname; /* "" == orphan */
char vgid[ID_LEN + 1]; char vgid[ID_LEN + 1];
const struct format_type *fmt; char _padding[7];
}; };
struct lvmcache_info { struct lvmcache_info {

View File

@ -32,17 +32,15 @@ struct config_info {
int syslog; int syslog;
int activation; int activation;
int suffix; int suffix;
uint64_t unit_factor;
char unit_type;
const char *msg_prefix;
int cmd_name; /* Show command name? */
int archive; /* should we archive ? */ int archive; /* should we archive ? */
int backup; /* should we backup ? */ int backup; /* should we backup ? */
const char *msg_prefix;
struct format_type *fmt; struct format_type *fmt;
uint64_t unit_factor;
int cmd_name; /* Show command name? */
mode_t umask; mode_t umask;
char unit_type;
char _padding[1];
}; };
struct config_tree; struct config_tree;

View File

@ -41,6 +41,7 @@ struct device {
struct list open_list; struct list open_list;
char pvid[ID_LEN + 1]; char pvid[ID_LEN + 1];
char _padding[7];
}; };
struct device_list { struct device_list {

View File

@ -855,9 +855,9 @@ static int _copypercent_disp(struct report_handle *rh, struct field *field,
static struct { static struct {
report_type_t type; report_type_t type;
const char id[30]; const char id[32];
off_t offset; off_t offset;
const char heading[30]; const char heading[32];
int width; int width;
uint32_t flags; uint32_t flags;
field_report_fn report_fn; field_report_fn report_fn;

View File

@ -25,11 +25,11 @@ struct id {
/* /*
* Unique logical volume identifier * Unique logical volume identifier
* With format1 this is VG uuid + LV uuid + '\0' * With format1 this is VG uuid + LV uuid + '\0' + padding
*/ */
union lvid { union lvid {
struct id id[2]; struct id id[2];
char s[2 * sizeof(struct id) + 1]; char s[2 * sizeof(struct id) + 1 + 7];
}; };
int lvid_from_lvnum(union lvid *lvid, struct id *vgid, uint32_t lv_num); int lvid_from_lvnum(union lvid *lvid, struct id *vgid, uint32_t lv_num);

View File

@ -54,7 +54,7 @@ extern char *optarg;
*/ */
struct arg the_args[ARG_COUNT + 1] = { struct arg the_args[ARG_COUNT + 1] = {
#define arg(a, b, c, d) {b, "--" c, d, 0, NULL, 0, 0, INT64_C(0), UINT64_C(0), 0, NULL}, #define arg(a, b, c, d) {b, "", "--" c, d, 0, NULL, 0, 0, INT64_C(0), UINT64_C(0), 0, NULL},
#include "args.h" #include "args.h"
#undef arg #undef arg

View File

@ -89,7 +89,9 @@ enum {
/* a global table of possible arguments */ /* a global table of possible arguments */
struct arg { struct arg {
const char short_arg; const char short_arg;
char _padding[7];
const char *long_arg; const char *long_arg;
int (*fn) (struct cmd_context * cmd, struct arg * a); int (*fn) (struct cmd_context * cmd, struct arg * a);
unsigned int count; unsigned int count;