aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2012-07-24 16:28:34 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2012-07-24 16:28:34 +0200
commitd3a42391b12b5428a246166e76175edbafbba069 (patch)
treec6a9184de8ccfbcd3bdc60bfd74061c7bb10a466
parent32f774cd344cf12336c22b0947f102274a99ee31 (diff)
downloadbusybox-w32-d3a42391b12b5428a246166e76175edbafbba069.tar.gz
busybox-w32-d3a42391b12b5428a246166e76175edbafbba069.tar.bz2
busybox-w32-d3a42391b12b5428a246166e76175edbafbba069.zip
*: declare strings with ALIGN1, as appropriate
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--include/libbb.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 322a28cab..f22e58e27 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1612,8 +1612,8 @@ unsigned get_cpu_count(void) FAST_FUNC;
1612char *percent_decode_in_place(char *str, int strict) FAST_FUNC; 1612char *percent_decode_in_place(char *str, int strict) FAST_FUNC;
1613 1613
1614 1614
1615extern const char bb_uuenc_tbl_base64[]; 1615extern const char bb_uuenc_tbl_base64[] ALIGN1;
1616extern const char bb_uuenc_tbl_std[]; 1616extern const char bb_uuenc_tbl_std[] ALIGN1;
1617void bb_uuencode(char *store, const void *s, int length, const char *tbl) FAST_FUNC; 1617void bb_uuencode(char *store, const void *s, int length, const char *tbl) FAST_FUNC;
1618enum { 1618enum {
1619 BASE64_FLAG_UU_STOP = 0x100, 1619 BASE64_FLAG_UU_STOP = 0x100,
@@ -1694,24 +1694,24 @@ extern const char *applet_name;
1694 * Therefore now we use #defines. 1694 * Therefore now we use #defines.
1695 */ 1695 */
1696/* "BusyBox vN.N.N (timestamp or extra_version)" */ 1696/* "BusyBox vN.N.N (timestamp or extra_version)" */
1697extern const char bb_banner[]; 1697extern const char bb_banner[] ALIGN1;
1698extern const char bb_msg_memory_exhausted[]; 1698extern const char bb_msg_memory_exhausted[] ALIGN1;
1699extern const char bb_msg_invalid_date[]; 1699extern const char bb_msg_invalid_date[] ALIGN1;
1700#define bb_msg_read_error "read error" 1700#define bb_msg_read_error "read error"
1701#define bb_msg_write_error "write error" 1701#define bb_msg_write_error "write error"
1702extern const char bb_msg_unknown[]; 1702extern const char bb_msg_unknown[] ALIGN1;
1703extern const char bb_msg_can_not_create_raw_socket[]; 1703extern const char bb_msg_can_not_create_raw_socket[] ALIGN1;
1704extern const char bb_msg_perm_denied_are_you_root[]; 1704extern const char bb_msg_perm_denied_are_you_root[] ALIGN1;
1705extern const char bb_msg_you_must_be_root[]; 1705extern const char bb_msg_you_must_be_root[] ALIGN1;
1706extern const char bb_msg_requires_arg[]; 1706extern const char bb_msg_requires_arg[] ALIGN1;
1707extern const char bb_msg_invalid_arg[]; 1707extern const char bb_msg_invalid_arg[] ALIGN1;
1708extern const char bb_msg_standard_input[]; 1708extern const char bb_msg_standard_input[] ALIGN1;
1709extern const char bb_msg_standard_output[]; 1709extern const char bb_msg_standard_output[] ALIGN1;
1710 1710
1711/* NB: (bb_hexdigits_upcase[i] | 0x20) -> lowercase hex digit */ 1711/* NB: (bb_hexdigits_upcase[i] | 0x20) -> lowercase hex digit */
1712extern const char bb_hexdigits_upcase[]; 1712extern const char bb_hexdigits_upcase[] ALIGN1;
1713 1713
1714extern const char bb_path_wtmp_file[]; 1714extern const char bb_path_wtmp_file[] ALIGN1;
1715 1715
1716/* Busybox mount uses either /proc/mounts or /etc/mtab to 1716/* Busybox mount uses either /proc/mounts or /etc/mtab to
1717 * get the list of currently mounted filesystems */ 1717 * get the list of currently mounted filesystems */
@@ -1725,10 +1725,10 @@ extern const char bb_path_wtmp_file[];
1725#define bb_path_motd_file "/etc/motd" 1725#define bb_path_motd_file "/etc/motd"
1726 1726
1727#define bb_dev_null "/dev/null" 1727#define bb_dev_null "/dev/null"
1728extern const char bb_busybox_exec_path[]; 1728extern const char bb_busybox_exec_path[] ALIGN1;
1729/* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin, 1729/* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,
1730 * but I want to save a few bytes here */ 1730 * but I want to save a few bytes here */
1731extern const char bb_PATH_root_path[]; /* "PATH=/sbin:/usr/sbin:/bin:/usr/bin" */ 1731extern const char bb_PATH_root_path[] ALIGN1; /* "PATH=/sbin:/usr/sbin:/bin:/usr/bin" */
1732#define bb_default_root_path (bb_PATH_root_path + sizeof("PATH")) 1732#define bb_default_root_path (bb_PATH_root_path + sizeof("PATH"))
1733#define bb_default_path (bb_PATH_root_path + sizeof("PATH=/sbin:/usr/sbin")) 1733#define bb_default_path (bb_PATH_root_path + sizeof("PATH=/sbin:/usr/sbin"))
1734 1734
@@ -1758,7 +1758,7 @@ extern struct globals *const ptr_to_globals;
1758 * If you change LIBBB_DEFAULT_LOGIN_SHELL, 1758 * If you change LIBBB_DEFAULT_LOGIN_SHELL,
1759 * don't forget to change increment constant. */ 1759 * don't forget to change increment constant. */
1760#define LIBBB_DEFAULT_LOGIN_SHELL "-/bin/sh" 1760#define LIBBB_DEFAULT_LOGIN_SHELL "-/bin/sh"
1761extern const char bb_default_login_shell[]; 1761extern const char bb_default_login_shell[] ALIGN1;
1762/* "/bin/sh" */ 1762/* "/bin/sh" */
1763#define DEFAULT_SHELL (bb_default_login_shell+1) 1763#define DEFAULT_SHELL (bb_default_login_shell+1)
1764/* "sh" */ 1764/* "sh" */