Mercurial > hg > xemacs-beta
annotate netinstall/hash.cc @ 5050:6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-02-20 Ben Wing <ben@xemacs.org>
* configure.ac (XE_COMPLEX_ARG):
Correct doc of --quick-build: It also doesn't check for Lisp shadows.
src/ChangeLog addition:
2010-02-20 Ben Wing <ben@xemacs.org>
* EmacsFrame.c:
* EmacsFrame.c (EmacsFrameRecomputeCellSize):
* alloca.c (i00afunc):
* buffer.c:
* buffer.c (MARKED_SLOT):
* buffer.c (complex_vars_of_buffer):
* cm.c:
* cm.c (cmcheckmagic):
* console.c:
* console.c (MARKED_SLOT):
* device-x.c:
* device-x.c (x_get_visual_depth):
* emacs.c (sort_args):
* eval.c (throw_or_bomb_out):
* event-stream.c:
* event-stream.c (Fadd_timeout):
* event-stream.c (Fadd_async_timeout):
* event-stream.c (Frecent_keys):
* events.c:
* events.c (Fdeallocate_event):
* events.c (event_pixel_translation):
* extents.c:
* extents.c (process_extents_for_insertion_mapper):
* fns.c (Fbase64_encode_region):
* fns.c (Fbase64_encode_string):
* fns.c (Fbase64_decode_region):
* fns.c (Fbase64_decode_string):
* font-lock.c:
* font-lock.c (find_context):
* frame-x.c:
* frame-x.c (x_wm_mark_shell_size_user_specified):
* frame-x.c (x_wm_mark_shell_position_user_specified):
* frame-x.c (x_wm_set_shell_iconic_p):
* frame-x.c (x_wm_set_cell_size):
* frame-x.c (x_wm_set_variable_size):
* frame-x.c (x_wm_store_class_hints):
* frame-x.c (x_wm_maybe_store_wm_command):
* frame-x.c (x_initialize_frame_size):
* frame.c (delete_frame_internal):
* frame.c (change_frame_size_1):
* free-hook.c (check_free):
* free-hook.c (note_block_input):
* free-hook.c (log_gcpro):
* gccache-gtk.c (gc_cache_lookup):
* gccache-x.c:
* gccache-x.c (gc_cache_lookup):
* glyphs-gtk.c:
* glyphs-gtk.c (init_image_instance_from_gdk_pixmap):
* glyphs-x.c:
* glyphs-x.c (extract_xpm_color_names):
* insdel.c:
* insdel.c (move_gap):
* keymap.c:
* keymap.c (keymap_lookup_directly):
* keymap.c (keymap_delete_inverse_internal):
* keymap.c (accessible_keymaps_mapper_1):
* keymap.c (where_is_recursive_mapper):
* lisp.h:
* lstream.c (make_lisp_buffer_stream_1):
* macros.c:
* macros.c (pop_kbd_macro_event):
* mc-alloc.c (remove_page_from_used_list):
* menubar-x.c:
* menubar-x.c (set_frame_menubar):
* ralloc.c:
* ralloc.c (obtain):
* ralloc.c (relinquish):
* ralloc.c (relocate_blocs):
* ralloc.c (resize_bloc):
* ralloc.c (r_alloc_free):
* ralloc.c (r_re_alloc):
* ralloc.c (r_alloc_thaw):
* ralloc.c (init_ralloc):
* ralloc.c (Free_Addr_Block):
* scrollbar-x.c:
* scrollbar-x.c (x_update_scrollbar_instance_status):
* sunplay.c (init_device):
* unexnt.c:
* unexnt.c (read_in_bss):
* unexnt.c (map_in_heap):
* window.c:
* window.c (real_window):
* window.c (window_display_lines):
* window.c (window_display_buffer):
* window.c (set_window_display_buffer):
* window.c (unshow_buffer):
* window.c (Fget_lru_window):
if (...) ABORT(); ---> assert();
More specifically:
if (x == y) ABORT (); --> assert (x != y);
if (x != y) ABORT (); --> assert (x == y);
if (x > y) ABORT (); --> assert (x <= y);
etc.
if (!x) ABORT (); --> assert (x);
if (x) ABORT (); --> assert (!x);
DeMorgan's Law's applied and manually simplified:
if (x && !y) ABORT (); --> assert (!x || y);
if (!x || y >= z) ABORT (); --> assert (x && y < z);
Checked to make sure that assert() of an expression with side
effects ensures that the side effects get executed even when
asserts are disabled, and add a comment about this being a
requirement of any "disabled assert" expression.
* depend:
* make-src-depend:
* make-src-depend (PrintDeps):
Fix broken code in make-src-depend so it does what it was always
supposed to do, which was separate out config.h and lisp.h and
all the files they include into separate variables in the
depend part of Makefile so that quick-build can turn off the
lisp.h/config.h/text.h/etc. dependencies of the source files, to
speed up recompilation.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 20 Feb 2010 05:05:54 -0600 |
| parents | 3078fd1074e8 |
| children |
| rev | line source |
|---|---|
| 448 | 1 /* |
| 2 * Copyright (c) 2000, Red Hat, Inc. | |
| 3 * | |
| 4 * This program is free software; you can redistribute it and/or modify | |
| 5 * it under the terms of the GNU General Public License as published by | |
| 6 * the Free Software Foundation; either version 2 of the License, or | |
| 7 * (at your option) any later version. | |
| 8 * | |
| 9 * A copy of the GNU General Public License can be found at | |
| 10 * http://www.gnu.org/ | |
| 11 * | |
| 12 * Written by DJ Delorie <dj@cygnus.com> | |
| 13 * | |
| 14 */ | |
| 15 | |
| 16 /* Simple hash class for install.cc */ | |
| 17 | |
| 18 #include "win32.h" | |
| 19 #include <stdlib.h> | |
| 20 #include <string.h> | |
| 21 | |
| 22 #include "hash.h" | |
| 23 | |
| 24 class hash_internals { | |
| 25 public: | |
| 26 char **keys; | |
| 27 int numkeys; | |
| 28 int maxkeys; | |
| 29 int prev_index; | |
| 30 }; | |
| 31 | |
| 32 hash::hash () | |
| 33 { | |
| 34 h = new hash_internals; | |
| 35 h->numkeys = 0; | |
| 36 h->maxkeys = 10; | |
| 37 h->keys = (char **) malloc (h->maxkeys * sizeof (char *)); | |
| 38 h->prev_index = 0; | |
| 39 } | |
| 40 | |
| 41 hash::~hash () | |
| 42 { | |
| 43 free (h->keys); | |
| 44 free (h); | |
| 45 } | |
| 46 | |
| 47 | |
| 48 void | |
| 49 hash::add (char *string) | |
| 50 { | |
| 51 int i; | |
| 52 for (i=0; i<h->numkeys; i++) | |
| 53 if (strcmp (h->keys[i], string) == 0) | |
| 54 return; | |
| 55 if (h->numkeys >= h->maxkeys) | |
| 56 { | |
| 57 h->maxkeys += 10; | |
| 58 h->keys = (char **) realloc (h->keys, h->maxkeys * sizeof (char *)); | |
| 59 } | |
| 60 | |
| 61 h->keys[h->numkeys] = _strdup (string); | |
| 62 h->numkeys ++; | |
| 63 } | |
| 64 | |
| 65 | |
| 66 int | |
| 67 hash::has (char *string) | |
| 68 { | |
| 69 int i; | |
| 70 for (i=0; i<h->numkeys; i++) | |
| 71 if (strcmp (h->keys[i], string) == 0) | |
| 72 return 1; | |
| 73 return 0; | |
| 74 } | |
| 75 | |
| 76 char * | |
| 77 hash::enumerate (char *prev) | |
| 78 { | |
| 79 if (prev == 0) | |
| 80 h->prev_index = -1; | |
| 81 h->prev_index ++; | |
| 82 if (h->prev_index >= h->numkeys) | |
| 83 return 0; | |
| 84 return h->keys[h->prev_index]; | |
| 85 } | |
| 86 | |
| 87 static int CDECL | |
| 88 rev_len (const void *va, const void *vb) | |
| 89 { | |
| 90 char *a = *(char **)va; | |
| 91 char *b = *(char **)vb; | |
| 92 return strcmp (b, a); | |
| 93 } | |
| 94 | |
| 95 void | |
| 96 hash::reverse_sort () | |
| 97 { | |
| 98 qsort (h->keys, h->numkeys, sizeof (h->keys[0]), rev_len); | |
| 99 } |