summaryrefslogtreecommitdiff
path: root/console-client
diff options
context:
space:
mode:
authorMarcus Brinkmann <marcus@gnu.org>2004-03-01 09:58:44 +0000
committerMarcus Brinkmann <marcus@gnu.org>2004-03-01 09:58:44 +0000
commitac1cab88f6e43ece947ef2e212f0a732f9c39d81 (patch)
tree38cac8a5bf4151ccb51d733b4fb408f8cc56e56e /console-client
parenta2a436b8a8c2d41030ab98e02cad653c254c025a (diff)
auth/
2003-08-17 Marcus Brinkmann <marcus@gnu.org> * auth.c: Include <stddef.h>. (pending_users, pending_server): Change type to struct hurd_ihash, initialize with HURD_IHASH_INITIALIZER. (struct pending): Change type of member LOCP to hurd_ihash_locp_t. (S_auth_user_authenticate): Use hurd_ihash_* functions instead ihash_*. (S_auth_server_authenticate): Likewise. (main): Do not allocate the hash tables. console-client/ 2003-08-17 Marcus Brinkmann <marcus@gnu.org> * vga-dynafont.c: Include <stddef.h>. (struct mapped_character): Change type of LOCP to hurd_ihash_locp_t. (struct dynafont): Change type of CHARMAP to struct hurd_ihash. (dynafont_new): Use hurd_ihash_init instead of ihash_create. Remove variable ERR. Call hurd_ihash_add instead of ihash_add. (dynafont_free): Call hurd_ihash_destroy, no ihash_free. (dynafont_lookup_internal): Use hurd_ihash_find, not ihash_find. (dynafont_lookup_internal): Call hurd_ihash_locp_remove instead ihash_locp_remove, and hurd_ihash_add instead ihash_add. (dynafont_change_font): Likewise. Clean out LOCP if character is unmapped. ftpfs/ 2003-08-17 Marcus Brinkmann <marcus@gnu.org> * ftpfs.h: Include <hurd/ihash.h>. (struct ftpfs): Change type of INODE_MAPPINGS to struct hurd_ihash. (struct ftpfs_dir_entry): Change type of INODE_LOCP to hurd_ihash_locp_t. * node.c (ftpfs_create_node): Call hurd_ihash_add, not ihash_add. (netfs_node_norefs): Call hurd_ihash_locp_remove, not ihash_locp_remove. * fs.c: Include <stddef.h>. (ftpfs_create): Call hurd_ihash_init, not hurd_ihash_create. Call hurd_ihash_destroy on error. libihash/ 2003-08-17 Marcus Brinkmann <marcus@gnu.org> * ihash.c: Rewritten. * ihash.h: Rewritten. * Makefile (SRCS): Remove sizes.c. (LCLHDRS): Remove priv.h. * primes.c, sizes.c, priv.h: Files removed. 2003-08-17 Marcus Brinkmann <marcus@gnu.org> * ports.h (struct port_bucket): Change type of HTABLE to struct hurd_ihash. (struct port_info): Change type of HENTRY to hurd_ihash_locp_t. * lookup-port.c (ports_lookup_port): Use hurd_ihash_find instead ihash_find. * bucket-iterate.c (_ports_bucket_class_iterate): Use HURD_IHASH_ITERATE instead ihash_iterate. * inhibit-all-rpcs.c (ports_inhibit_all_rpcs): Likewise. * inhibit-bucket-rpcs.c (ports_inhibit_bucket_rpcs): Likewise. * create-internal.c (_ports_create_port_internal): Use hurd_ihash_add instead ihash_add. * import-port.c (ports_import_port): Likewise. * reallocate-from-external.c (ports_reallocate_from_external): Likewise. * reallocate-port.c (ports_reallocate_port): Likewise. * transfer-right.c (ports_transfer_right): Likewise. * create-bucket.c: Include <stddef.h>. (ports_create_bucket): Use hurd_ihash_init instead hurd_ihash_create. * class-iterate.c: Do not include <hurd/ihash.h>. * claim-right.c (ports_claim_right): Call hurd_ihash_locp_remove instead ihash_locp_remove. * complete-deallocate.c (_ports_complete_deallocate): Likewise. * destroy-right.c (ports_destroy_right): Likewise. * reallocate-from-external.c (ports_reallocate_from_external): Likewise. * reallocate-port.c (ports_reallocate_port): Likewise. * transfer-right.c (ports_transfer_right): Likewise. libps/ 2003-08-17 Marcus Brinkmann <marcus@gnu.org> * ps.h (struct ps_context): Change type of members procs, ttys, ttys_by_cttyid and users to struct hurd_ihash. * context.c (ps_context_create): Remove variables err_procs, err_ttys, err_ttys_by_cttyid and err_users. Use hurd_ihash_init instead of ihash_create. Call hurd_ihash_set_cleanup and the hurd_ihash_cleanup_t type instead of ihash_set_cleanup. (ps_context_free): Call hurd_ihash_destroy instead of ihash_free. (lookup): Call hurd_ihash_find instead ihash_find, hurd_ihash_add instead ihash_add. (ps_context_find_proc_stat): Take pointer of hash object. (ps_context_find_tty): Likewise. (ps_context_find_tty_by_cttyid): Likewise. (ps_context_find_user): Likewise. libpthread/ 2003-08-17 Marcus Brinkmann <marcus@gnu.org> * sysdeps/hurd/pt-key.h (PTHREAD_KEY_MEMBERS): Change type of THREAD_SPECIFICS to hurd_ihash_t. * sysdeps/hurd/pt-setspecific.c (pthread_setspecific): Call hurd_ihash_create instead ihash_create, and hurd_ihash_add instead ihash_add. * sysdeps/hurd/pt-getspecific.c (pthread_getspecific): Call hurd_ihash_find instead of ihash_find. * sysdeps/hurd/pt-destroy-specific.c (__pthread_destroy_specific): Call hurd_ihash_find instead of ihash_find, hurd_ihash_remove instead of ihash_remove, and hurd_ihash_free instead of ihash_free. proc/ 2003-08-17 Marcus Brinkmann <marcus@gnu.org> * proc.h: Include <hurd/ihash.h>. (struct proc): Change type of members p_pidhashloc and p_taskhashloc to hurd_ihash_locp_t. (struct pgrp): Likewise for pg_hashloc. (struct session): Likewise for s_hashloc. * hash.c: Change type of pghash, pidhash, taskhash and sidhash to struct hurd_ihash and initialize them with HURD_IHASH_INITIALIZER. Include stddef.h. (pid_find): Call hurd_ihash_find instead ihash_find. (pid_find_allow_zombie): Likewise. (task_find): Likewise. (task_find_nocreate): Likewise. (pgrp_find): Likewise. (session_find): Likewise. (add_proc_to_hash): Call hurd_ihash_add instead ihash_add. (add_pgrp_to_hash): Likewise. (add_session_to_hash): Likewise. (remove_pgrp_from_hash): Call hurd_ihash_locp_remove instead ihash_locp_remove, and provide hash table pointer. (remove_proc_from_hash): Likewise. (remove_session_from_hash): Likewise. (prociterate): Use HURD_IHASH_ITERATE instead ihash_iterate. trans/ 2003-08-17 Marcus Brinkmann <marcus@gnu.org> * fakeroot.c: Include <stddef.h>. (struct netnode): Change type of member idport_locp to hurd_ihash_locp_t. (idport_ihash): Change type to struct hurd_ihash and initialize with HURD_IHASH_INITIALIZER. (new_node): Call hurd_ihash_add instead of ihash_add. (netfs_node_norefs): Call hrd_ihash_locp_remove instead ihash_locp_remove. (netfs_S_dir_lookup): Call hurd_ihash_find instead ihash_find. utils/ 2003-08-17 Marcus Brinkmann <marcus@gnu.org> * rpctrace.c: Include <stddef.h>. (struct traced_info): Change type of LOCP to hurd_ihash_locp_t. (msgid_ihash): Change type to struct hurd_ihash, and initialize with HURD_IHASH_INITIALIZER, don't set cleanup here. (traced_names): Likewise. (main): Call hurd_ihash_set_cleanup for msgid_ihash. Don't create traced_names. (parse_msgid_list): Call hurd_ihash_add instead ihash_add. (new_send_wrapper): Likewise. (msgid_info): Likewise. Call hurd_ihash_find instead ihash_find. (rewrite_right): Likewise. (traced_dropweak): Call hurd_ihash_locp_remove instead ihash_locp_remove.
Diffstat (limited to 'console-client')
-rw-r--r--console-client/ChangeLog15
-rw-r--r--console-client/vga-dynafont.c38
2 files changed, 33 insertions, 20 deletions
diff --git a/console-client/ChangeLog b/console-client/ChangeLog
index 5a313fa2..a3fdd3f6 100644
--- a/console-client/ChangeLog
+++ b/console-client/ChangeLog
@@ -1,3 +1,18 @@
+2003-08-17 Marcus Brinkmann <marcus@gnu.org>
+
+ * vga-dynafont.c: Include <stddef.h>.
+ (struct mapped_character): Change type of LOCP to
+ hurd_ihash_locp_t.
+ (struct dynafont): Change type of CHARMAP to struct hurd_ihash.
+ (dynafont_new): Use hurd_ihash_init instead of ihash_create.
+ Remove variable ERR. Call hurd_ihash_add instead of ihash_add.
+ (dynafont_free): Call hurd_ihash_destroy, no ihash_free.
+ (dynafont_lookup_internal): Use hurd_ihash_find, not ihash_find.
+ (dynafont_lookup_internal): Call hurd_ihash_locp_remove instead
+ ihash_locp_remove, and hurd_ihash_add instead ihash_add.
+ (dynafont_change_font): Likewise. Clean out LOCP if character is
+ unmapped.
+
2004-02-02 Marco Gerards <metgerards@student.han.nl>
* pc-kbd.c (KDSETLEDS): New macro.
diff --git a/console-client/vga-dynafont.c b/console-client/vga-dynafont.c
index 97ca2d83..0cce5176 100644
--- a/console-client/vga-dynafont.c
+++ b/console-client/vga-dynafont.c
@@ -18,6 +18,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */
+#include <stddef.h>
#include <assert.h>
#include <malloc.h>
#include <wchar.h>
@@ -65,7 +66,7 @@ struct mapped_character
wchar_t character;
/* Used by libihash for fast removal of elements. */
- void **locp;
+ hurd_ihash_locp_t locp;
};
@@ -88,7 +89,7 @@ struct dynafont
/* A hash containing a pointer to a struct mapped_character for each
UCS-4 character we map to a VGA font index. */
- ihash_t charmap;
+ struct hurd_ihash charmap;
/* The struct mapped_characters are preallocated for all vga font
index values. This points to an array of SIZE such elements. */
@@ -468,7 +469,6 @@ error_t
dynafont_new (bdf_font_t font, bdf_font_t font_italic, bdf_font_t font_bold,
bdf_font_t font_bold_italic, int size, dynafont_t *dynafont)
{
- error_t err = 0;
dynafont_t df;
struct bdf_glyph *glyph = NULL;
@@ -491,17 +491,10 @@ dynafont_new (bdf_font_t font, bdf_font_t font_italic, bdf_font_t font_bold,
df->font_bold_italic = font_bold_italic;
df->size = size;
df->cursor_standout = 0;
- err = ihash_create (&df->charmap);
- if (err)
- {
- free (df);
- return err;
- }
df->charmap_data = calloc (size, sizeof (struct mapped_character));
if (!df->charmap_data)
{
- ihash_free (df->charmap);
free (df);
return ENOMEM;
}
@@ -509,11 +502,13 @@ dynafont_new (bdf_font_t font, bdf_font_t font_italic, bdf_font_t font_bold,
df->vga_font = malloc (sizeof (vga_font_glyph) * size);
if (!df->vga_font)
{
- ihash_free (df->charmap);
free (df->charmap_data);
free (df);
return ENOMEM;
}
+
+ hurd_ihash_init (&df->charmap, offsetof (struct mapped_character, locp));
+
if (df->font->bbox.width == 9)
{
/* 32 from 256 font slots are for horizontal line graphic
@@ -556,8 +551,7 @@ dynafont_new (bdf_font_t font, bdf_font_t font_italic, bdf_font_t font_bold,
+ df->font->bbox.height, 0, 32 - df->font->bbox.height);
/* Update the hash table. */
- ihash_add (df->charmap, UNICODE_REPLACEMENT_CHARACTER,
- chr, &chr->locp);
+ hurd_ihash_add (&df->charmap, UNICODE_REPLACEMENT_CHARACTER, chr);
}
else
{
@@ -582,7 +576,7 @@ dynafont_new (bdf_font_t font, bdf_font_t font_italic, bdf_font_t font_bold,
}
*dynafont = df;
- return err;
+ return 0;
}
@@ -600,7 +594,7 @@ dynafont_free (dynafont_t df)
bdf_destroy (df->font_bold);
if (df->font_bold_italic)
bdf_destroy (df->font_bold_italic);
- ihash_free (df->charmap);
+ hurd_ihash_destroy (&df->charmap);
free (df->charmap_data);
free (df->vga_font);
free (df);
@@ -757,8 +751,8 @@ dynafont_lookup_internal (dynafont_t df, bdf_font_t font,
wchar_t wide_chr, wchar_t attr, int *rpos)
{
/* When hashing the character, we mix in the font attribute. */
- struct mapped_character *chr = ihash_find (df->charmap,
- (int) (wide_chr | attr));
+ struct mapped_character *chr = hurd_ihash_find (&df->charmap,
+ (int) (wide_chr | attr));
int lgc;
struct bdf_glyph *glyph;
int pos;
@@ -867,8 +861,8 @@ dynafont_lookup_internal (dynafont_t df, bdf_font_t font,
VGA_FONT_HEIGHT);
/* Update the hash table. */
if (chr->locp)
- ihash_locp_remove (df->charmap, chr->locp);
- ihash_add (df->charmap, (int) (wide_chr | attr), chr, &chr->locp);
+ hurd_ihash_locp_remove (&df->charmap, chr->locp);
+ hurd_ihash_add (&df->charmap, (int) (wide_chr | attr), chr);
*rpos = pos;
return 1;
}
@@ -1000,7 +994,11 @@ dynafont_change_font (dynafont_t df, bdf_font_t font)
/* The glyph is not used. If it is mapped, we need to
remove the mapping to invalidate the glyph. */
if (df->charmap_data[i].locp)
- ihash_locp_remove (df->charmap, df->charmap_data[i].locp);
+ {
+
+ hurd_ihash_locp_remove (&df->charmap, df->charmap_data[i].locp);
+ df->charmap_data[i].locp = NULL;
+ }
}
else