aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-01-31 09:53:53 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-01-31 09:53:53 +0000
commit9f4a1e1c75e86a38da22a3e82980fcddc4e58717 (patch)
tree707fdec25c2510d52f3ba6b2e4da15ce9089efd0 /util-linux
parentdfe6e74157e98a696b60c586a4ed0a35b9362838 (diff)
downloadbusybox-w32-9f4a1e1c75e86a38da22a3e82980fcddc4e58717.tar.gz
busybox-w32-9f4a1e1c75e86a38da22a3e82980fcddc4e58717.tar.bz2
busybox-w32-9f4a1e1c75e86a38da22a3e82980fcddc4e58717.zip
- add and use ATTRIBUTE_ALIGNED(num_bytes)
- remove unused parameter pindex from fdisk.c, xbsd_initlabel()
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/fdisk.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 48bea42c9..886b2695b 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -867,8 +867,7 @@ static int xbsd_get_part_index (int max);
867static int xbsd_check_new_partition (int *i); 867static int xbsd_check_new_partition (int *i);
868static void xbsd_list_types (void); 868static void xbsd_list_types (void);
869static u_short xbsd_dkcksum (struct xbsd_disklabel *lp); 869static u_short xbsd_dkcksum (struct xbsd_disklabel *lp);
870static int xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d, 870static int xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d);
871 int pindex);
872static int xbsd_readlabel (struct partition *p, struct xbsd_disklabel *d); 871static int xbsd_readlabel (struct partition *p, struct xbsd_disklabel *d);
873static int xbsd_writelabel (struct partition *p, struct xbsd_disklabel *d); 872static int xbsd_writelabel (struct partition *p, struct xbsd_disklabel *d);
874 873
@@ -885,7 +884,7 @@ static int xbsd_part_index;
885 884
886#if defined (__alpha__) 885#if defined (__alpha__)
887/* We access this through a uint64_t * when checksumming */ 886/* We access this through a uint64_t * when checksumming */
888static char disklabelbuffer[BSD_BBSIZE] __attribute__((aligned(8))); 887static char disklabelbuffer[BSD_BBSIZE] ATTRIBUTE_ALIGNED(8);
889#else 888#else
890static char disklabelbuffer[BSD_BBSIZE]; 889static char disklabelbuffer[BSD_BBSIZE];
891#endif 890#endif
@@ -1223,9 +1222,9 @@ xbsd_create_disklabel (void) {
1223 if (xbsd_initlabel ( 1222 if (xbsd_initlabel (
1224#if defined (__alpha__) || defined (__powerpc__) || defined (__hppa__) || \ 1223#if defined (__alpha__) || defined (__powerpc__) || defined (__hppa__) || \
1225 defined (__s390__) || defined (__s390x__) 1224 defined (__s390__) || defined (__s390x__)
1226 NULL, &xbsd_dlabel, 0 1225 NULL, &xbsd_dlabel
1227#else 1226#else
1228 xbsd_part, &xbsd_dlabel, xbsd_part_index 1227 xbsd_part, &xbsd_dlabel/* not used, xbsd_part_index*/
1229#endif 1228#endif
1230 ) == 1) { 1229 ) == 1) {
1231 xbsd_print_disklabel (1); 1230 xbsd_print_disklabel (1);
@@ -1454,7 +1453,7 @@ xbsd_dkcksum (struct xbsd_disklabel *lp) {
1454} 1453}
1455 1454
1456static int 1455static int
1457xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d, int pindex) { 1456xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d) {
1458 struct xbsd_partition *pp; 1457 struct xbsd_partition *pp;
1459 1458
1460 get_geometry (); 1459 get_geometry ();