comparison src/nt.c @ 4976:16112448d484

Rename xfree(FOO, TYPE) -> xfree(FOO) -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-04 Ben Wing <ben@xemacs.org> * alloc.c (release_breathing_space): * alloc.c (resize_string): * alloc.c (sweep_lcrecords_1): * alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): * alloc.c (ADDITIONAL_FREE_compiled_function): * alloc.c (compact_string_chars): * alloc.c (ADDITIONAL_FREE_string): * alloc.c (sweep_strings): * alloca.c (xemacs_c_alloca): * alsaplay.c (alsa_play_sound_file): * buffer.c (init_initial_directory): * buffer.h: * buffer.h (BUFFER_FREE): * console-stream.c (stream_delete_console): * console-tty.c (free_tty_console_struct): * data.c (Fnumber_to_string): * device-gtk.c (gtk_init_device): * device-gtk.c (free_gtk_device_struct): * device-gtk.c (gtk_delete_device): * device-msw.c (mswindows_delete_device): * device-msw.c (msprinter_delete_device): * device-tty.c (free_tty_device_struct): * device-tty.c (tty_delete_device): * device-x.c (x_init_device): * device-x.c (free_x_device_struct): * device-x.c (x_delete_device): * dialog-msw.c (handle_directory_dialog_box): * dialog-x.c (dbox_descriptor_to_widget_value): * dired-msw.c (Fmswindows_insert_directory): * dired.c (free_user_cache): * dired.c (user_name_completion_unwind): * doc.c (unparesseuxify_doc_string): * doc.c (Fsubstitute_command_keys): * doprnt.c (emacs_doprnt_1): * dumper.c (pdump_load_finish): * dumper.c (pdump_file_free): * dumper.c (pdump_file_unmap): * dynarr.c: * dynarr.c (Dynarr_free): * editfns.c (uncache_home_directory): * editfns.c (Fset_time_zone_rule): * elhash.c: * elhash.c (pdump_reorganize_hash_table): * elhash.c (maphash_unwind): * emacs.c (make_arg_list_1): * emacs.c (free_argc_argv): * emacs.c (sort_args): * emacs.c (Frunning_temacs_p): * emodules.c (attempt_module_delete): * eval.c (free_pointer): * event-Xt.c (unselect_filedesc): * event-Xt.c (emacs_Xt_select_process): * event-gtk.c (unselect_filedesc): * event-gtk.c (dragndrop_data_received): * event-msw.c (winsock_closer): * event-msw.c (mswindows_dde_callback): * event-msw.c (mswindows_wnd_proc): * event-stream.c (finalize_command_builder): * event-stream.c (free_command_builder): * extents.c (free_gap_array): * extents.c (free_extent_list): * extents.c (free_soe): * extents.c (extent_fragment_delete): * extents.c (extent_priority_sort_function): * file-coding.c (make_coding_system_1): * file-coding.c (coding_finalizer): * file-coding.c (set_coding_stream_coding_system): * file-coding.c (chain_finalize_coding_stream_1): * file-coding.c (chain_finalize): * file-coding.c (free_detection_state): * file-coding.c (coding_category_symbol_to_id): * fileio.c: * fileio.c (Ffile_name_directory): * fileio.c (if): * fileio.c (Ffile_symlink_p): * filelock.c (FREE_LOCK_INFO): * filelock.c (current_lock_owner): * font-mgr.c (Ffc_name_unparse): * font-mgr.c (Ffc_pattern_duplicate): * frame-gtk.c (gtk_delete_frame): * frame-msw.c (mswindows_delete_frame): * frame-msw.c (msprinter_delete_frame): * frame-x.c (x_cde_destroy_callback): * frame-x.c (Fcde_start_drag_internal): * frame-x.c (x_cde_transfer_callback): * frame-x.c (x_delete_frame): * frame.c (update_frame_title): * frame.c (Fset_frame_pointer): * gc.c (register_for_finalization): * gccache-gtk.c (free_gc_cache): * gccache-gtk.c (gc_cache_lookup): * gccache-x.c (free_gc_cache): * gccache-x.c (gc_cache_lookup): * glyphs-eimage.c: * glyphs-eimage.c (jpeg_instantiate_unwind): * glyphs-eimage.c (gif_instantiate_unwind): * glyphs-eimage.c (png_instantiate_unwind): * glyphs-eimage.c (png_instantiate): * glyphs-eimage.c (tiff_instantiate_unwind): * glyphs-gtk.c (convert_EImage_to_GDKImage): * glyphs-gtk.c (gtk_finalize_image_instance): * glyphs-gtk.c (gtk_init_image_instance_from_eimage): * glyphs-gtk.c (gtk_xpm_instantiate): * glyphs-msw.c (convert_EImage_to_DIBitmap): * glyphs-msw.c (mswindows_init_image_instance_from_eimage): * glyphs-msw.c (mswindows_initialize_image_instance_mask): * glyphs-msw.c (xpm_to_eimage): * glyphs-msw.c (mswindows_xpm_instantiate): * glyphs-msw.c (xbm_create_bitmap_from_data): * glyphs-msw.c (mswindows_finalize_image_instance): * glyphs-x.c (convert_EImage_to_XImage): * glyphs-x.c (x_finalize_image_instance): * glyphs-x.c (x_init_image_instance_from_eimage): * glyphs-x.c (x_xpm_instantiate): * gui-x.c (free_popup_widget_value_tree): * hash.c (free_hash_table): * hash.c (grow_hash_table): * hash.c (pregrow_hash_table_if_necessary): * imgproc.c (build_EImage_quantable): * insdel.c (uninit_buffer_text): * intl-win32.c (convert_multibyte_to_internal_malloc): * intl.c: * intl.c (Fset_current_locale): * keymap.c: * keymap.c (where_is_recursive_mapper): * keymap.c (where_is_internal): * lisp.h: * lisp.h (xfree): * lstream.c (Lstream_close): * lstream.c (resizing_buffer_closer): * mule-coding.c: * mule-coding.c (iso2022_finalize_detection_state): * nt.c: * nt.c (mswindows_get_long_filename): * nt.c (nt_get_resource): * nt.c (init_mswindows_environment): * nt.c (get_cached_volume_information): * nt.c (mswindows_opendir): * nt.c (mswindows_closedir): * nt.c (mswindows_readdir): * nt.c (mswindows_stat): * nt.c (mswindows_getdcwd): * nt.c (Fmswindows_long_file_name): * ntplay.c (nt_play_sound_file): * ntplay.c (play_sound_data_1): * number-gmp.c (gmp_free): * number-gmp.c (init_number_gmp): * number-mp.c (bignum_to_string): * number-mp.c (BIGNUM_TO_TYPE): * number.c (bignum_print): * number.c (bignum_convfree): * number.c (ratio_print): * number.c (bigfloat_print): * number.c (bigfloat_finalize): * objects-gtk.c (gtk_finalize_color_instance): * objects-gtk.c (gtk_finalize_font_instance): * objects-msw.c (mswindows_finalize_color_instance): * objects-msw.c (mswindows_finalize_font_instance): * objects-tty.c (tty_finalize_color_instance): * objects-tty.c (tty_finalize_font_instance): * objects-tty.c (tty_font_list): * objects-x.c (x_finalize_color_instance): * objects-x.c (x_finalize_font_instance): * process.c: * process.c (finalize_process): * realpath.c: * redisplay.c (add_propagation_runes): * regex.c: * regex.c (xfree): * regex.c (REGEX_FREE_STACK): * regex.c (FREE_STACK_RETURN): * regex.c (regex_compile): * regex.c (regexec): * regex.c (regfree): * scrollbar-gtk.c (gtk_free_scrollbar_instance): * scrollbar-gtk.c (gtk_release_scrollbar_instance): * scrollbar-msw.c (mswindows_free_scrollbar_instance): * scrollbar-msw.c (unshow_that_mofo): * scrollbar-x.c (x_free_scrollbar_instance): * scrollbar-x.c (x_release_scrollbar_instance): * select-gtk.c (emacs_gtk_selection_handle): * select-msw.c (mswindows_own_selection): * select-x.c: * select-x.c (x_handle_selection_request): * select-x.c (unexpect_property_change): * select-x.c (x_handle_property_notify): * select-x.c (receive_incremental_selection): * select-x.c (x_get_window_property_as_lisp_data): * select-x.c (Fx_get_cutbuffer_internal): * specifier.c (finalize_specifier): * syntax.c (uninit_buffer_syntax_cache): * sysdep.c (qxe_allocating_getcwd): * sysdep.c (qxe_lstat): * sysdep.c (copy_in_passwd): * sysdep.c (qxe_ctime): * sysdep.c (closedir): * sysdep.c (DIRSIZ): * termcap.c (tgetent): * termcap.c (tprint): * tests.c (Ftest_data_format_conversion): * text.c (new_dfc_convert_copy_data): * text.h (eifree): * text.h (eito_alloca): * text.h (eito_external): * toolbar-msw.c (mswindows_output_toolbar): * ui-gtk.c (CONVERT_RETVAL): * ui-gtk.c (__allocate_object_storage): * unicode.c (free_from_unicode_table): * unicode.c (free_to_unicode_table): * unicode.c (free_charset_unicode_tables): * win32.c (mswindows_read_link_1): Rename: xfree(VAL, TYPE)->xfree(VAL) Command used: gr 'xfree *\((.*),.*\);' 'xfree (\1);' *.[ch] Followed by grepping for 'xfree.*,' and fixing anything left. Rationale: Having to specify the TYPE argument is annoying and error-prone. It was originally put in to work around warnings due to strict aliasing but years and years ago I rewrote it in a way that doesn't use the TYPE argument at all and no one has complained since then. (And anyway, XEmacs is far from ever being in compliance with strict aliasing and would require far-reaching changes to get that way.)
author Ben Wing <ben@xemacs.org>
date Thu, 04 Feb 2010 07:28:14 -0600
parents 304aebb79cd3
children 3c3c1d139863
comparison
equal deleted inserted replaced
4972:c448f4c38d65 4976:16112448d484
336 if (p != NULL) 336 if (p != NULL)
337 { 337 {
338 *p++ = '\\'; 338 *p++ = '\\';
339 eicat_ch (o, '\\'); 339 eicat_ch (o, '\\');
340 } 340 }
341 xfree (component, Ibyte *); 341 xfree (component);
342 } 342 }
343 else 343 else
344 { 344 {
345 xfree (full, Ibyte *); 345 xfree (full);
346 return 0; 346 return 0;
347 } 347 }
348 } 348 }
349 349
350 xfree (full, Ibyte *); 350 xfree (full);
351 return eicpyout_malloc (o, 0); 351 return eicpyout_malloc (o, 0);
352 } 352 }
353 353
354 static int 354 static int
355 is_unc_volume (const Ibyte *filename) 355 is_unc_volume (const Ibyte *filename)
393 && qxeRegQueryValueEx (hrootkey, keyext, NULL, lpdwtype, lpvalue, 393 && qxeRegQueryValueEx (hrootkey, keyext, NULL, lpdwtype, lpvalue,
394 &cbData) == ERROR_SUCCESS) 394 &cbData) == ERROR_SUCCESS)
395 return (lpvalue); 395 return (lpvalue);
396 396
397 if (lpvalue) 397 if (lpvalue)
398 xfree (lpvalue, LPBYTE); 398 xfree (lpvalue);
399 399
400 RegCloseKey (hrootkey); 400 RegCloseKey (hrootkey);
401 } 401 }
402 402
403 if (qxeRegOpenKeyEx (HKEY_LOCAL_MACHINE, XETEXT (REG_ROOT), 0, KEY_READ, 403 if (qxeRegOpenKeyEx (HKEY_LOCAL_MACHINE, XETEXT (REG_ROOT), 0, KEY_READ,
411 qxeRegQueryValueEx (hrootkey, keyext, NULL, lpdwtype, lpvalue, 411 qxeRegQueryValueEx (hrootkey, keyext, NULL, lpdwtype, lpvalue,
412 &cbData) == ERROR_SUCCESS) 412 &cbData) == ERROR_SUCCESS)
413 return (lpvalue); 413 return (lpvalue);
414 414
415 if (lpvalue) 415 if (lpvalue)
416 xfree (lpvalue, LPBYTE); 416 xfree (lpvalue);
417 417
418 RegCloseKey (hrootkey); 418 RegCloseKey (hrootkey);
419 } 419 }
420 420
421 return (NULL); 421 return (NULL);
497 497
498 TSTR_TO_C_STRING (lpval, envval); 498 TSTR_TO_C_STRING (lpval, envval);
499 eputenv (env_vars[i], (CIbyte *) envval); 499 eputenv (env_vars[i], (CIbyte *) envval);
500 } 500 }
501 501
502 xfree (lpval, LPBYTE); 502 xfree (lpval);
503 } 503 }
504 } 504 }
505 } 505 }
506 506
507 /* Another special case: on NT, the PATH variable is actually named 507 /* Another special case: on NT, the PATH variable is actually named
703 info = xnew (volume_info_data); 703 info = xnew (volume_info_data);
704 add_volume_info (root_dir, info); 704 add_volume_info (root_dir, info);
705 } 705 }
706 else 706 else
707 { 707 {
708 xfree (info->name, Ibyte *); 708 xfree (info->name);
709 xfree (info->type, Ibyte *); 709 xfree (info->type);
710 } 710 }
711 711
712 TSTR_TO_C_STRING_MALLOC (name, info->name); 712 TSTR_TO_C_STRING_MALLOC (name, info->name);
713 info->serialnum = serialnum; 713 info->serialnum = serialnum;
714 info->maxcomp = maxcomp; 714 info->maxcomp = maxcomp;
826 826
827 if (!(dirp = xnew_and_zero (DIR))) 827 if (!(dirp = xnew_and_zero (DIR)))
828 return NULL; 828 return NULL;
829 829
830 if (dir_pathname) 830 if (dir_pathname)
831 xfree (dir_pathname, Ibyte *); 831 xfree (dir_pathname);
832 dir_pathname = qxestrdup (filename); 832 dir_pathname = qxestrdup (filename);
833 833
834 return dirp; 834 return dirp;
835 } 835 }
836 836
848 else if (wnet_enum_handle != INVALID_HANDLE_VALUE) 848 else if (wnet_enum_handle != INVALID_HANDLE_VALUE)
849 { 849 {
850 retval = close_unc_volume (wnet_enum_handle); 850 retval = close_unc_volume (wnet_enum_handle);
851 wnet_enum_handle = INVALID_HANDLE_VALUE; 851 wnet_enum_handle = INVALID_HANDLE_VALUE;
852 } 852 }
853 xfree (dirp, DIR *); 853 xfree (dirp);
854 854
855 return retval; 855 return retval;
856 } 856 }
857 857
858 struct direct * 858 struct direct *
923 eicat_ch (linkname, '\\'); 923 eicat_ch (linkname, '\\');
924 eicat_rawz (linkname, val); 924 eicat_rawz (linkname, val);
925 resolved = mswindows_read_link (eidata (linkname)); 925 resolved = mswindows_read_link (eidata (linkname));
926 if (resolved) 926 if (resolved)
927 { 927 {
928 xfree (resolved, Ibyte *); 928 xfree (resolved);
929 len -= 4; 929 len -= 4;
930 val[len] = '\0'; 930 val[len] = '\0';
931 } 931 }
932 } 932 }
933 } 933 }
934 934
935 eicpy_rawz (found, val); 935 eicpy_rawz (found, val);
936 if (need_to_free) 936 if (need_to_free)
937 xfree (val, Ibyte *); 937 xfree (val);
938 938
939 if (!NILP (Vmswindows_downcase_file_names)) 939 if (!NILP (Vmswindows_downcase_file_names))
940 eilwr (found); 940 eilwr (found);
941 941
942 namlen = min (eilen (found), sizeof (dir_static.d_name) - 1); 942 namlen = min (eilen (found), sizeof (dir_static.d_name) - 1);
1688 { 1688 {
1689 /* check if link is valid */ 1689 /* check if link is valid */
1690 Ibyte *resolved = mswindows_read_link (name); 1690 Ibyte *resolved = mswindows_read_link (name);
1691 if (resolved) 1691 if (resolved)
1692 { 1692 {
1693 xfree (resolved, Ibyte *); 1693 xfree (resolved);
1694 buf->st_mode = S_IFLNK; 1694 buf->st_mode = S_IFLNK;
1695 } 1695 }
1696 } 1696 }
1697 } 1697 }
1698 } 1698 }
1840 cwdext = (Extbyte *) _wgetdcwd (drivelet, NULL, 0); 1840 cwdext = (Extbyte *) _wgetdcwd (drivelet, NULL, 0);
1841 else 1841 else
1842 cwdext = _getdcwd (drivelet, NULL, 0); 1842 cwdext = _getdcwd (drivelet, NULL, 0);
1843 if (cwdext == NULL) return NULL; 1843 if (cwdext == NULL) return NULL;
1844 TSTR_TO_C_STRING_MALLOC (cwdext, cwd); 1844 TSTR_TO_C_STRING_MALLOC (cwdext, cwd);
1845 xfree (cwdext, Extbyte *); 1845 xfree (cwdext);
1846 return cwd; 1846 return cwd;
1847 } 1847 }
1848 1848
1849 1849
1850 /*--------------------------------------------------------------------*/ 1850 /*--------------------------------------------------------------------*/
2131 if (!(longname = mswindows_get_long_filename (XSTRING_DATA (filename)))) 2131 if (!(longname = mswindows_get_long_filename (XSTRING_DATA (filename))))
2132 return Qnil; 2132 return Qnil;
2133 2133
2134 canon = mswindows_canonicalize_filename (longname); 2134 canon = mswindows_canonicalize_filename (longname);
2135 ret = build_istring (canon); 2135 ret = build_istring (canon);
2136 xfree (canon, Ibyte *); 2136 xfree (canon);
2137 xfree (longname, Ibyte *); 2137 xfree (longname);
2138 return ret; 2138 return ret;
2139 } 2139 }
2140 2140
2141 2141
2142 void 2142 void