X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgroff-font.c;h=e4df2cff7c94788222323fc06eab5d610b251750;hb=18febf84744dc7ab4248542c2f88d91c01ef3fa1;hp=2510b894769c285cac1c8761dd3601d7f92319e8;hpb=4944c86a9318bc5b5578ab145a95c116ffd2c9fd;p=pspp diff --git a/src/groff-font.c b/src/groff-font.c index 2510b89476..e4df2cff7c 100644 --- a/src/groff-font.c +++ b/src/groff-font.c @@ -18,6 +18,7 @@ 02111-1307, USA. */ #include +#include "font.h" #include #include #include @@ -27,7 +28,6 @@ #include "alloc.h" #include "error.h" #include "filename.h" -#include "font.h" #include "hash.h" #include "pool.h" #include "str.h" @@ -38,7 +38,7 @@ int font_number_to_index (int); int space_index; static int font_msg (int, const char *,...) - __attribute__ ((format (printf, 2, 3))); + PRINTF_FORMAT (2, 3); static void scan_badchars (char *, int); static void dup_char_metric (struct font_desc * font, int dest, int src); static void add_char_metric (struct font_desc * font, struct char_metrics *metrics, @@ -100,7 +100,7 @@ groff_read_font (const char *fn) /* Current location in file, used for error reporting. */ struct file_locator where; -#if unix +#ifdef unix fn = fn_tilde_expand (fn); #endif @@ -130,8 +130,7 @@ groff_read_font (const char *fn) font->metric_size = 0; font->metric_used = 0; font->kern = NULL; - font->kern_size = 0; - font->kern_size_p = hsh_next_prime (64); + font->kern_size = 8; font->kern_used = 0; font->kern_max_used = 0; @@ -356,7 +355,7 @@ groff_read_font (const char *fn) goto file_lossage; } free (line); -#if unix +#ifdef unix free ((char *) fn); #endif @@ -379,9 +378,10 @@ file_lossage: /* Come here on any error. */ lose: - fclose (f); + if (f != NULL) + fclose (f); pool_destroy (font_pool); -#if unix +#ifdef unix free ((char *) fn); #endif err_pop_file_locator (&where); @@ -439,10 +439,8 @@ struct index_hash /* Character index hash table. */ static struct { - int size; /* Size of table. */ - int *size_p; /* Next larger table size. */ + int size; /* Size of table (must be power of 2). */ int used; /* Number of full entries. */ - int max_used; /* # used entries where we enlarge & rehash. */ int next_index; /* Next index to allocate. */ struct index_hash *tab; /* Hash table proper. */ struct pool *ar; /* Pool for names. */ @@ -471,10 +469,8 @@ font_char_name_to_index (const char *name) if (!hash.tab) { - hash.size_p = hsh_next_prime (128); - hash.size = *hash.size_p++; + hash.size = 128; hash.used = 0; - hash.max_used = hash.size / 2; hash.next_index = 256; hash.tab = xmalloc (sizeof *hash.tab * hash.size); hash.ar = pool_create (); @@ -482,7 +478,7 @@ font_char_name_to_index (const char *name) hash.tab[i].name = NULL; } - for (i = hashpjw (name) % hash.size; hash.tab[i].name;) + for (i = hsh_hash_string (name) & (hash.size - 1); hash.tab[i].name; ) { if (!strcmp (hash.tab[i].name, name)) return hash.tab[i].index; @@ -491,21 +487,21 @@ font_char_name_to_index (const char *name) } hash.used++; - if (hash.used >= hash.max_used) + if (hash.used >= hash.size / 2) { struct index_hash *old_tab = hash.tab; int old_size = hash.size; int i, j; - hash.size = *hash.size_p++; - hash.max_used = hash.size / 2; + hash.size *= 2; hash.tab = xmalloc (sizeof *hash.tab * hash.size); for (i = 0; i < hash.size; i++) hash.tab[i].name = NULL; for (i = 0; i < old_size; i++) if (old_tab[i].name) { - for (j = hashpjw (old_tab[i].name) % hash.size; hash.tab[j].name;) + for (j = hsh_hash_string (old_tab[i].name) & (hash.size - 1); + hash.tab[j].name;) if (++j >= hash.size) j = 0; hash.tab[j] = old_tab[i]; @@ -597,29 +593,33 @@ add_kern (struct font_desc *font, int ch1, int ch2, int adjust) int old_kern_size = font->kern_size; int j; - font->kern_size = *font->kern_size_p++; + font->kern_size *= 2; font->kern_max_used = font->kern_size / 2; font->kern = pool_malloc (font->owner, sizeof *font->kern * font->kern_size); for (i = 0; i < font->kern_size; i++) font->kern[i].ch1 = -1; - for (i = 0; i < old_kern_size; i++) - { - if (old_kern[i].ch1 == -1) - continue; - - j = hash_kern (old_kern[i].ch1, old_kern[i].ch2) % font->kern_size; - while (font->kern[j].ch1 != -1) - if (0 == j--) - j = font->kern_size - 1; - font->kern[j] = old_kern[i]; - } if (old_kern) - pool_free (font->owner, old_kern); + { + for (i = 0; i < old_kern_size; i++) + { + if (old_kern[i].ch1 == -1) + continue; + + j = (hash_kern (old_kern[i].ch1, old_kern[i].ch2) + & (font->kern_size - 1)); + while (font->kern[j].ch1 != -1) + if (0 == j--) + j = font->kern_size - 1; + font->kern[j] = old_kern[i]; + } + pool_free (font->owner, old_kern); + } } - for (i = hash_kern (ch1, ch2) % font->kern_size; font->kern[i].ch1 != -1;) + for (i = hash_kern (ch1, ch2) & (font->kern_size - 1); + font->kern[i].ch1 != -1; ) if (0 == i--) i = font->kern_size - 1; font->kern[i].ch1 = ch1; @@ -964,7 +964,8 @@ font_get_kern_adjust (const struct font_desc *font, int ch1, int ch2) if (!font->kern) return 0; - for (i = hash_kern (ch1, ch2) % font->kern_size; font->kern[i].ch1 != -1;) + for (i = hash_kern (ch1, ch2) & (font->kern_size - 1); + font->kern[i].ch1 != -1;) { if (font->kern[i].ch1 == ch1 && font->kern[i].ch2 == ch2) return font->kern[i].adjust; @@ -1002,8 +1003,7 @@ default_font (void) font->metric_size = 0; font->metric_used = 0; font->kern = NULL; - font->kern_size = 0; - font->kern_size_p = hsh_next_prime (64); + font->kern_size = 8; font->kern_used = 0; font->kern_max_used = 0; return font;