Mercurial > emacs
comparison lwlib/lwlib.c @ 109165:750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
* alloc.c (overrun_check_malloc, overrun_check_realloc)
(overrun_check_free, xstrdup, allocate_string)
(allocate_string_data, compact_small_strings, Fmake_string)
(make_unibyte_string, make_multibyte_string)
(make_string_from_bytes, make_specified_string, make_float)
(Fcons, allocate_terminal, allocate_frame, make_pure_string)
(Fgarbage_collect): Replace bcopy, safe_bcopy, bzero, bcmp by
memcpy, memmove, memset, memcmp.
* atimer.c (start_atimer, set_alarm): Likewise.
* buffer.c (clone_per_buffer_values, report_overlay_modification)
(mmap_realloc, init_buffer_once): Likewise.
* callint.c (Fcall_interactively): Likewise.
* callproc.c (Fcall_process, Fcall_process_region, child_setup)
(getenv_internal_1): Likewise.
* casefiddle.c (casify_object): Likewise.
* ccl.c (ccl_driver): Likewise.
* character.c (str_as_multibyte, str_to_multibyte): Likewise.
* charset.c (load_charset_map_from_file)
(load_charset_map_from_file, load_charset_map_from_vector)
(Fdefine_charset_internal): Likewise.
* cm.c (Wcm_clear): Likewise.
* coding.c (decode_eol, decode_coding_object)
(Fset_coding_system_priority, make_subsidiaries): Likewise.
* data.c (Faset): Likewise.
* dired.c (directory_files_internal, file_name_completion_stat):
Likewise.
* dispnew.c (new_glyph_matrix, adjust_glyph_matrix)
(clear_glyph_row, copy_row_except_pointers)
(copy_glyph_row_contents, new_glyph_pool, realloc_glyph_pool)
(save_current_matrix, restore_current_matrix)
(build_frame_matrix_from_leaf_window, mirrored_line_dance)
(mirror_line_dance, scrolling_window): Likewise.
* doc.c (Fsnarf_documentation, Fsubstitute_command_keys):
Likewise.
* doprnt.c (doprnt): Likewise.
* editfns.c (Fuser_full_name, make_buffer_string_both)
(Fmessage_box, Fformat, Ftranspose_regions): Likewise.
* emacs.c (sort_args): Likewise.
* eval.c (Fapply, Ffuncall): Likewise.
* fileio.c (Ffile_name_directory, make_temp_name)
(Fexpand_file_name, search_embedded_absfilename)
(Fsubstitute_in_file_name, Ffile_symlink_p, Finsert_file_contents)
(auto_save_error): Likewise.
* fns.c (Fstring_equal, Fcopy_sequence, concat)
(string_to_multibyte, Fstring_as_unibyte, Fstring_as_multibyte)
(internal_equal, Fclear_string, larger_vector, copy_hash_table)
(Fmake_hash_table): Likewise.
* fringe.c (Fdefine_fringe_bitmap): Likewise.
* ftfont.c (ftfont_text_extents): Likewise.
* getloadavg.c (getloadavg): Likewise.
* image.c (define_image_type, make_image, make_image_cache)
(x_create_x_image_and_pixmap, xbm_image_p)
(w32_create_pixmap_from_bitmap_data, xbm_load, xpm_lookup_color)
(xpm_image_p, x_create_bitmap_from_xpm_data, xpm_load)
(init_color_table, x_build_heuristic_mask, pbm_image_p, pbm_load)
(png_image_p, png_read_from_memory, png_load, jpeg_image_p)
(tiff_image_p, tiff_read_from_memory, gif_image_p)
(gif_read_from_memory, gif_load, svg_image_p, gs_image_p):
Likewise.
* indent.c (scan_for_column, compute_motion): Likewise.
* insdel.c (gap_left, gap_right, make_gap_smaller, copy_text)
(insert_1_both, insert_from_gap, replace_range_2): Likewise.
* intervals.c (reproduce_tree, reproduce_tree_obj): Likewise.
* keyboard.c (echo_char, save_getcjmp, restore_getcjmp)
(kbd_buffer_store_event_hold, apply_modifiers_uncached)
(store_user_signal_events, menu_bar_items, tool_bar_items)
(process_tool_bar_item, append_tool_bar_item)
(read_char_minibuf_menu_prompt, read_key_sequence)
(Fread_key_sequence, Fread_key_sequence_vector, Frecent_keys):
Likewise.
* keymap.c (current_minor_maps, Fdescribe_buffer_bindings):
Likewise.
* lisp.h (STRING_COPYIN): Likewise.
* lread.c (Fload, read1, oblookup): Likewise.
* msdos.c (Frecent_doskeys): Likewise.
* nsfns.m (Fx_create_frame): Likewise.
* nsfont.m (nsfont_open, nsfont_text_extents, ns_glyph_metrics):
Likewise.
* nsimage.m (EmacsImage-initFromSkipXBM:width:height:)
(EmacsImage-initForXPMWithDepth:width:height:flip:length:):
Likewise.
* nsmenu.m (ns_update_menubar): Likewise.
* nsterm.m (ns_draw_fringe_bitmap, ns_term_init): Likewise.
* print.c (print_unwind, printchar, strout, print_string)
(print_error_message): Likewise.
* process.c (conv_lisp_to_sockaddr, set_socket_option)
(Fmake_network_process, Fnetwork_interface_list)
(Fnetwork_interface_info, read_process_output, Fprocess_send_eof)
(init_process): Likewise.
* ralloc.c (resize_bloc, r_alloc_sbrk, r_alloc_init): Likewise.
* regex.c (init_syntax_once, regex_compile, re_compile_fastmap):
Likewise.
* scroll.c (do_scrolling, do_direct_scrolling)
(scrolling_max_lines_saved): Likewise.
* search.c (search_buffer, wordify, Freplace_match): Likewise.
* sound.c (wav_init, au_init, Fplay_sound_internal): Likewise.
* syntax.c (skip_chars, skip_syntaxes): Likewise.
* sysdep.c (child_setup_tty, sys_subshell, emacs_get_tty)
(emacs_set_tty): Likewise.
* term.c (encode_terminal_code, calculate_costs)
(produce_special_glyphs, create_tty_output, init_tty, delete_tty):
Likewise.
* termcap.c (tgetst1, gobble_line): Likewise.
* termhooks.h (EVENT_INIT): Likewise.
* tparam.c (tparam1): Likewise.
* unexalpha.c (unexec): Likewise.
* unexec.c (write_segment): Likewise.
* unexmacosx.c (unexec_write_zero): Likewise.
* w32fns.c (w32_wnd_proc, Fx_create_frame, x_create_tip_frame)
(Fx_file_dialog, Fsystem_move_file_to_trash): Likewise.
* w32font.c (w32font_list_family, w32font_text_extents)
(w32font_list_internal, w32font_match_internal)
(w32font_open_internal, compute_metrics, Fx_select_font):
Likewise.
* w32menu.c (set_frame_menubar, add_menu_item)
(w32_menu_display_help, w32_free_submenu_strings): Likewise.
* w32term.c (XCreateGC, w32_initialize_display_info): Likewise.
* w32uniscribe.c (uniscribe_list_family): Likewise.
* w32xfns.c (get_next_msg, post_msg, prepend_msg): Likewise.
* window.c (make_window, replace_window, set_window_buffer)
(Fsplit_window): Likewise.
* xdisp.c (init_iterator, RECORD_OVERLAY_STRING, reseat_to_string)
(add_to_log, message3, x_consider_frame_title)
(append_space_for_newline, extend_face_to_end_of_line)
(decode_mode_spec_coding, init_glyph_string): Likewise.
* xfaces.c (x_create_gc, get_lface_attributes_no_remap)
(Finternal_copy_lisp_face, Finternal_merge_in_global_face)
(face_attr_equal_p, make_realized_face, make_face_cache)
(free_realized_faces, lookup_named_face, smaller_face)
(face_with_height, lookup_derived_face)
(x_supports_face_attributes_p, Finternal_set_font_selection_order)
(Finternal_set_font_selection_order, realize_default_face)
(compute_char_face, face_at_buffer_position)
(face_for_overlay_string, face_at_string_position, merge_faces):
Likewise.
* xfns.c (xic_create_fontsetname, Fx_create_frame)
(Fx_window_property, x_create_tip_frame)
(Fx_backspace_delete_keys_p): Likewise.
* xfont.c (xfont_list, xfont_match, xfont_list_family)
(xfont_text_extents): Likewise.
* xmenu.c (set_frame_menubar, xmenu_show): Likewise.
* xrdb.c (magic_file_p, x_get_resource): Likewise.
* xselect.c (x_queue_event, x_get_window_property)
(receive_incremental_selection): Likewise.
* xsmfns.c (x_session_check_input): Likewise.
* xterm.c (x_send_scroll_bar_event, SET_SAVED_MENU_EVENT)
(handle_one_xevent, x_check_errors, xim_initialize, x_term_init):
Likewise.
* character.h (BCOPY_SHORT): Removed.
* config.in: Regenerate.
* dispnew.c (safe_bcopy): Only define as dummy if PROFILING.
* emacs.c (main) [PROFILING]: Don't declare
dump_opcode_frequencies.
* lisp.h (safe_bcopy): Remove declaration.
(memset) [!HAVE_MEMSET]: Declare.
(memcpy) [!HAVE_MEMCPY]: Likewise.
(memmove) [!HAVE_MEMMOVE]: Likewise.
(memcmp) [!HAVE_MEMCMP]: Likewise.
* s/ms-w32.h (bzero, bcopy, bcmp, GAP_USE_BCOPY)
(BCOPY_UPWARD_SAFE, BCOPY_DOWNWARD_SAFE, HAVE_BCOPY, HAVE_BCMP):
Don't define.
(HAVE_MEMCMP, HAVE_MEMCPY, HAVE_MEMMOVE, HAVE_MEMSET): Define.
* s/msdos.h (GAP_USE_BCOPY, BCOPY_UPWARD_SAFE)
(BCOPY_DOWNWARD_SAFE): Don't define.
* sysdep.c (memset) [!HAVE_MEMSET]: Define.
(memcpy) [!HAVE_MEMCPY]: Define.
(memmove) [!HAVE_MEMMOVE]: Define.
(memcmp) [!HAVE_MEMCMP]: Define.
* config.nt (HAVE_BCOPY, HAVE_BCMP): Remove undefs.
(HAVE_MEMCPY, HAVE_MEMMOVE, HAVE_MEMSET, HAVE_MEMCMP): Add undefs.
* sed2v2.inp (HAVE_MEMCPY, HAVE_MEMSET): Edit to 1.
(HAVE_BZERO): Don't edit.
* lwlib.c (lwlib_memset, lwlib_bcopy): Remove.
(malloc_widget_value, free_widget_info, allocate_widget_instance)
(lw_separator_p): Replace lwlib_memset, lwlib_bcopy, bzero, bcmp by
memset, memcpy, memcmp.
* lwlib-utils.c (XtApplyToWidgets): Likewise.
* xlwmenu.c (XlwMenuInitialize): Likewise.
* lwlib.h (lwlib_bcopy): Remove declaration.
* ebrowse.c (add_sym, make_namespace): Replace bcopy, bzero by
memcpy, memmove, memset.
* pop.c (pop_retrieve, socket_connection, pop_getline): Likewise.
* CPP-DEFINES (BCOPY_DOWNWARD_SAFE, BCOPY_UPWARD_SAFE)
(GAP_USE_BCOPY, HAVE_BCMP, HAVE_BCOPY, bcmp, bcopy, bzero):
Remove.
* configure.in: Don't check for bcopy, bcmp, bzero. Don't include
<strings.h> and don't define bcopy, bzero, BCMP in config.h.
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 08 Jul 2010 00:18:28 +0200 |
parents | 384b3408c143 |
children | d8a16c4fa9b1 |
comparison
equal
deleted
inserted
replaced
109164:a7b09b567d58 | 109165:750db9f3e6d8 |
---|---|
102 static Boolean dialog_spec_p (char *); | 102 static Boolean dialog_spec_p (char *); |
103 static void destroy_one_instance (widget_instance *); | 103 static void destroy_one_instance (widget_instance *); |
104 static void lw_pop_all_widgets (LWLIB_ID, Boolean); | 104 static void lw_pop_all_widgets (LWLIB_ID, Boolean); |
105 static Boolean get_one_value (widget_instance *, widget_value *); | 105 static Boolean get_one_value (widget_instance *, widget_value *); |
106 static void show_one_widget_busy (Widget, Boolean); | 106 static void show_one_widget_busy (Widget, Boolean); |
107 | |
108 void | |
109 lwlib_memset (char *address, int value, size_t length) | |
110 { | |
111 int i; | |
112 | |
113 for (i = 0; i < length; i++) | |
114 address[i] = value; | |
115 } | |
116 | |
117 void | |
118 lwlib_bcopy (char *from, char *to, int length) | |
119 { | |
120 int i; | |
121 | |
122 for (i = 0; i < length; i++) | |
123 to[i] = from[i]; | |
124 } | |
125 /* utility functions for widget_instance and widget_info */ | 107 /* utility functions for widget_instance and widget_info */ |
126 char * | 108 char * |
127 safe_strdup (const char *s) | 109 safe_strdup (const char *s) |
128 { | 110 { |
129 char *result; | 111 char *result; |
177 else | 159 else |
178 { | 160 { |
179 wv = (widget_value *) malloc (sizeof (widget_value)); | 161 wv = (widget_value *) malloc (sizeof (widget_value)); |
180 malloc_cpt++; | 162 malloc_cpt++; |
181 } | 163 } |
182 lwlib_memset ((void*) wv, 0, sizeof (widget_value)); | 164 memset ((void*) wv, 0, sizeof (widget_value)); |
183 return wv; | 165 return wv; |
184 } | 166 } |
185 | 167 |
186 /* this is analogous to free(). It frees only what was allocated | 168 /* this is analogous to free(). It frees only what was allocated |
187 by malloc_widget_value(), and no substructures. | 169 by malloc_widget_value(), and no substructures. |
300 free_widget_info (widget_info *info) | 282 free_widget_info (widget_info *info) |
301 { | 283 { |
302 safe_free_str (info->type); | 284 safe_free_str (info->type); |
303 safe_free_str (info->name); | 285 safe_free_str (info->name); |
304 free_widget_value_tree (info->val); | 286 free_widget_value_tree (info->val); |
305 lwlib_memset ((void*)info, 0xDEADBEEF, sizeof (widget_info)); | 287 memset ((void*)info, 0xDEADBEEF, sizeof (widget_info)); |
306 free (info); | 288 free (info); |
307 } | 289 } |
308 | 290 |
309 static void | 291 static void |
310 mark_widget_destroyed (Widget widget, XtPointer closure, XtPointer call_data) | 292 mark_widget_destroyed (Widget widget, XtPointer closure, XtPointer call_data) |
329 Boolean pop_up_p; | 311 Boolean pop_up_p; |
330 #endif | 312 #endif |
331 { | 313 { |
332 widget_instance* instance = | 314 widget_instance* instance = |
333 (widget_instance*)malloc (sizeof (widget_instance)); | 315 (widget_instance*)malloc (sizeof (widget_instance)); |
334 bzero (instance, sizeof *instance); | 316 memset (instance, 0, sizeof *instance); |
335 instance->parent = parent; | 317 instance->parent = parent; |
336 instance->pop_up_p = pop_up_p; | 318 instance->pop_up_p = pop_up_p; |
337 instance->info = info; | 319 instance->info = info; |
338 instance->next = info->instances; | 320 instance->next = info->instances; |
339 info->instances = instance; | 321 info->instances = instance; |
346 } | 328 } |
347 | 329 |
348 static void | 330 static void |
349 free_widget_instance (widget_instance *instance) | 331 free_widget_instance (widget_instance *instance) |
350 { | 332 { |
351 lwlib_memset ((void*)instance, 0xDEADBEEF, sizeof (widget_instance)); | 333 memset ((void*)instance, 0xDEADBEEF, sizeof (widget_instance)); |
352 free (instance); | 334 free (instance); |
353 } | 335 } |
354 | 336 |
355 static widget_info * | 337 static widget_info * |
356 #ifdef PROTOTYPES | 338 #ifdef PROTOTYPES |
1451 lw_separator_p (char *label, enum menu_separator *type, int motif_p) | 1433 lw_separator_p (char *label, enum menu_separator *type, int motif_p) |
1452 { | 1434 { |
1453 int separator_p = 0; | 1435 int separator_p = 0; |
1454 | 1436 |
1455 if (strlen (label) >= 3 | 1437 if (strlen (label) >= 3 |
1456 && bcmp (label, "--:", 3) == 0) | 1438 && memcmp (label, "--:", 3) == 0) |
1457 { | 1439 { |
1458 static struct separator_table | 1440 static struct separator_table |
1459 { | 1441 { |
1460 char *name; | 1442 char *name; |
1461 enum menu_separator type; | 1443 enum menu_separator type; |
1494 *type -= 4; | 1476 *type -= 4; |
1495 break; | 1477 break; |
1496 } | 1478 } |
1497 } | 1479 } |
1498 else if (strlen (label) > 3 | 1480 else if (strlen (label) > 3 |
1499 && bcmp (label, "--", 2) == 0 | 1481 && memcmp (label, "--", 2) == 0 |
1500 && label[2] != '-') | 1482 && label[2] != '-') |
1501 { | 1483 { |
1502 /* Alternative, more Emacs-style names. */ | 1484 /* Alternative, more Emacs-style names. */ |
1503 static struct separator_table | 1485 static struct separator_table |
1504 { | 1486 { |