diff options
| -rw-r--r-- | src/ChangeLog | 18 | ||||
| -rw-r--r-- | src/coding.c | 2 | ||||
| -rw-r--r-- | src/fileio.c | 2 | ||||
| -rw-r--r-- | src/fns.c | 4 | ||||
| -rw-r--r-- | src/fringe.c | 2 | ||||
| -rw-r--r-- | src/gtkutil.c | 2 | ||||
| -rw-r--r-- | src/image.c | 22 | ||||
| -rw-r--r-- | src/keyboard.c | 4 | ||||
| -rw-r--r-- | src/process.c | 6 | ||||
| -rw-r--r-- | src/sysdep.c | 2 | ||||
| -rw-r--r-- | src/termcap.c | 6 | ||||
| -rw-r--r-- | src/xdisp.c | 2 | ||||
| -rw-r--r-- | src/xfns.c | 8 |
13 files changed, 45 insertions, 35 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c3d4e29124..5389118f62 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,22 @@ 2009-11-11 Dan Nicolaescu <[email protected]> + * process.c (ifflag_def): Make flag_sym constant. + (Fnetwork_interface_info): Use a constant pointer. + (ifflag_table): + * xfns.c (cursor_bits): + * xdisp.c (power_letter): + * termcap.c (speeds, esctab): + * sysdep.c (baud_convert): + * keyboard.c (lispy_accent_codes, modifier_names): + * image.c (xbm_format, xpm_format, pbm_format, png_format) + (jpeg_format, tiff_format, gif_format, svg_format) + (interlace_start, interlace_increment, gs_format): + * gtkutil.c (separator_names): + * fringe.c (swap_nibble): + * fns.c (base64_value_to_char, base64_char_to_value): + * fileio.c (make_temp_name_tbl): + * coding.c (suffixes): Make constant. + * frame.c (make_initial_frame): * buffer.c (init_buffer_once): Use make_pure_c_string instead of build_string. @@ -18,6 +35,7 @@ * lread.c (syms_of_lread): * keyboard.c (syms_of_keyboard): Use make_pure_c_string instead of build_string. + * doc.c (Fsnarf_documentation): Purecopy Vbuild_files. 2009-11-10 Stefan Monnier <[email protected]> diff --git a/src/coding.c b/src/coding.c index b13766e307..1d838db368 100644 --- a/src/coding.c +++ b/src/coding.c @@ -9621,7 +9621,7 @@ HIGHESTP non-nil means just return the highest priority one. */) return Fnreverse (val); } -static char *suffixes[] = { "-unix", "-dos", "-mac" }; +static const char *const suffixes[] = { "-unix", "-dos", "-mac" }; static Lisp_Object make_subsidiaries (base) diff --git a/src/fileio.c b/src/fileio.c index bdab1d6180..1625c3d254 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -657,7 +657,7 @@ In Unix-syntax, this function just removes the final slash. */) STRING_MULTIBYTE (directory)); } -static char make_temp_name_tbl[64] = +static const char make_temp_name_tbl[64] = { 'A','B','C','D','E','F','G','H', 'I','J','K','L','M','N','O','P', @@ -3189,7 +3189,7 @@ The data read from the system are decoded using `locale-coding-system'. */) while (IS_BASE64_IGNORABLE (c)) /* Table of characters coding the 64 values. */ -static char base64_value_to_char[64] = +static const char base64_value_to_char[64] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', /* 0- 9 */ 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', /* 10-19 */ @@ -3201,7 +3201,7 @@ static char base64_value_to_char[64] = }; /* Table of base64 values for first 128 characters. */ -static short base64_char_to_value[128] = +static const short base64_char_to_value[128] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0- 9 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 10- 19 */ diff --git a/src/fringe.c b/src/fringe.c index 2cea24b1dc..febb7a5301 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -1330,7 +1330,7 @@ If BITMAP overrides a standard fringe bitmap, the original bitmap is restored. */ #if defined (HAVE_X_WINDOWS) -static unsigned char swap_nibble[16] = { +static const unsigned char swap_nibble[16] = { 0x0, 0x8, 0x4, 0xc, /* 0000 1000 0100 1100 */ 0x2, 0xa, 0x6, 0xe, /* 0010 1010 0110 1110 */ 0x1, 0x9, 0x5, 0xd, /* 0001 1001 0101 1101 */ diff --git a/src/gtkutil.c b/src/gtkutil.c index ba9d95e032..e972679a57 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -2013,7 +2013,7 @@ make_menu_item (utf8_label, utf8_key, item, group) /* Return non-zero if LABEL specifies a separator (GTK only has one separator type) */ -static char* separator_names[] = { +static const char* separator_names[] = { "space", "no-line", "single-line", diff --git a/src/image.c b/src/image.c index 55ceec326c..8cd8355acb 100644 --- a/src/image.c +++ b/src/image.c @@ -2338,7 +2338,7 @@ enum xbm_keyword_index /* Vector of image_keyword structures describing the format of valid XBM image specifications. */ -static struct image_keyword xbm_format[XBM_LAST] = +static const struct image_keyword xbm_format[XBM_LAST] = { {":type", IMAGE_SYMBOL_VALUE, 1}, {":file", IMAGE_STRING_VALUE, 0}, @@ -3138,7 +3138,7 @@ enum xpm_keyword_index /* Vector of image_keyword structures describing the format of valid XPM image specifications. */ -static struct image_keyword xpm_format[XPM_LAST] = +static const struct image_keyword xpm_format[XPM_LAST] = { {":type", IMAGE_SYMBOL_VALUE, 1}, {":file", IMAGE_STRING_VALUE, 0}, @@ -5087,7 +5087,7 @@ enum pbm_keyword_index /* Vector of image_keyword structures describing the format of valid user-defined image specifications. */ -static struct image_keyword pbm_format[PBM_LAST] = +static const struct image_keyword pbm_format[PBM_LAST] = { {":type", IMAGE_SYMBOL_VALUE, 1}, {":file", IMAGE_STRING_VALUE, 0}, @@ -5509,7 +5509,7 @@ enum png_keyword_index /* Vector of image_keyword structures describing the format of valid user-defined image specifications. */ -static struct image_keyword png_format[PNG_LAST] = +static const struct image_keyword png_format[PNG_LAST] = { {":type", IMAGE_SYMBOL_VALUE, 1}, {":data", IMAGE_STRING_VALUE, 0}, @@ -6111,7 +6111,7 @@ enum jpeg_keyword_index /* Vector of image_keyword structures describing the format of valid user-defined image specifications. */ -static struct image_keyword jpeg_format[JPEG_LAST] = +static const struct image_keyword jpeg_format[JPEG_LAST] = { {":type", IMAGE_SYMBOL_VALUE, 1}, {":data", IMAGE_STRING_VALUE, 0}, @@ -6684,7 +6684,7 @@ enum tiff_keyword_index /* Vector of image_keyword structures describing the format of valid user-defined image specifications. */ -static struct image_keyword tiff_format[TIFF_LAST] = +static const struct image_keyword tiff_format[TIFF_LAST] = { {":type", IMAGE_SYMBOL_VALUE, 1}, {":data", IMAGE_STRING_VALUE, 0}, @@ -7136,7 +7136,7 @@ enum gif_keyword_index /* Vector of image_keyword structures describing the format of valid user-defined image specifications. */ -static struct image_keyword gif_format[GIF_LAST] = +static const struct image_keyword gif_format[GIF_LAST] = { {":type", IMAGE_SYMBOL_VALUE, 1}, {":data", IMAGE_STRING_VALUE, 0}, @@ -7280,8 +7280,8 @@ gif_read_from_memory (file, buf, len) /* Load GIF image IMG for use on frame F. Value is non-zero if successful. */ -static int interlace_start[] = {0, 4, 2, 1}; -static int interlace_increment[] = {8, 8, 4, 2}; +static const int interlace_start[] = {0, 4, 2, 1}; +static const int interlace_increment[] = {8, 8, 4, 2}; static int gif_load (f, img) @@ -7575,7 +7575,7 @@ enum svg_keyword_index /* Vector of image_keyword structures describing the format of valid user-defined image specifications. */ -static struct image_keyword svg_format[SVG_LAST] = +static const struct image_keyword svg_format[SVG_LAST] = { {":type", IMAGE_SYMBOL_VALUE, 1}, {":data", IMAGE_STRING_VALUE, 0}, @@ -7982,7 +7982,7 @@ enum gs_keyword_index /* Vector of image_keyword structures describing the format of valid user-defined image specifications. */ -static struct image_keyword gs_format[GS_LAST] = +static const struct image_keyword gs_format[GS_LAST] = { {":type", IMAGE_SYMBOL_VALUE, 1}, {":pt-width", IMAGE_POSITIVE_INTEGER_VALUE, 1}, diff --git a/src/keyboard.c b/src/keyboard.c index 3b4f0c54eb..5ea4f35080 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -4770,7 +4770,7 @@ static Lisp_Object drag_n_drop_syms; /* This is a list of keysym codes for special "accent" characters. It parallels lispy_accent_keys. */ -static int lispy_accent_codes[] = +static const int lispy_accent_codes[] = { #ifdef XK_dead_circumflex XK_dead_circumflex, @@ -6484,7 +6484,7 @@ apply_modifiers_uncached (modifiers, base, base_len, base_len_byte) } -static char *modifier_names[] = +static const char *modifier_names[] = { "up", "down", "drag", "click", "double", "triple", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/src/process.c b/src/process.c index fd94731a41..b604f97cff 100644 --- a/src/process.c +++ b/src/process.c @@ -3980,10 +3980,10 @@ format; see the description of ADDRESS in `make-network-process'. */) struct ifflag_def { int flag_bit; - char *flag_sym; + const char *flag_sym; }; -static struct ifflag_def ifflag_table[] = { +static const struct ifflag_def ifflag_table[] = { #ifdef IFF_UP { IFF_UP, "up" }, #endif @@ -4079,7 +4079,7 @@ FLAGS is the current flags of the interface. */) if (ioctl (s, SIOCGIFFLAGS, &rq) == 0) { int flags = rq.ifr_flags; - struct ifflag_def *fp; + const struct ifflag_def *fp; int fnum; any++; diff --git a/src/sysdep.c b/src/sysdep.c index fc252e87aa..b983694baf 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -168,7 +168,7 @@ struct utimbuf { #define LPASS8 0 #endif -static int baud_convert[] = +static const int baud_convert[] = { 0, 50, 75, 110, 135, 150, 200, 300, 600, 1200, 1800, 2400, 4800, 9600, 19200, 38400 diff --git a/src/termcap.c b/src/termcap.c index 46254c67c1..9b4a7f657f 100644 --- a/src/termcap.c +++ b/src/termcap.c @@ -184,7 +184,7 @@ tgetstr (cap, area) gives meaning of character following \, or a space if no special meaning. Sixteen characters per line within the string. */ -static char esctab[] +static const char esctab[] = " \057\026 \047\014 \ \025 \015 \ \005 \013 \ @@ -194,7 +194,7 @@ static char esctab[] gives meaning of character following \, or a space if no special meaning. Eight characters per line within the string. */ -static char esctab[] +static const char esctab[] = " \007\010 \033\014 \ \012 \ \015 \011 \013 \ @@ -348,7 +348,7 @@ char PC; /* Actual baud rate if positive; - baud rate / 100 if negative. */ -static int speeds[] = +static const int speeds[] = { 0, 50, 75, 110, 135, 150, -2, -3, -6, -12, -18, -24, -48, -96, -192, -288, -384, -576, -1152 diff --git a/src/xdisp.c b/src/xdisp.c index 46cd45a9eb..568fa0fdd0 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -18077,7 +18077,7 @@ pint2str (buf, width, d) readable" representation of the nonnegative integer D to BUF using a minimal field width WIDTH. D should be smaller than 999.5e24. */ -static const char power_letter[] = +static const const char power_letter[] = { 0, /* not used */ 'k', /* kilo */ diff --git a/src/xfns.c b/src/xfns.c index 9d4c1f8063..0a041a7dc9 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -2885,14 +2885,6 @@ x_icon (f, parms) background, border and mouse colors; also create the mouse cursor and the gray border tile. */ -static char cursor_bits[] = - { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - }; - static void x_make_gc (f) struct frame *f; |