This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch dde in repository hurd.
commit ae4d849a17efe460b11ac74dbc159b20a54a7421 Author: Samuel Thibault <[email protected]> Date: Sun Nov 29 13:25:03 2015 +0100 Drop spurious debugging or outdated changes --- console/display.c | 1 - daemons/getty.c | 2 -- daemons/runttys.c | 6 ------ devnode/ChangeLog | 34 ---------------------------------- ext2fs/ext2fs.c | 19 ------------------- libdiskfs/boot-start.c | 13 ------------- libdiskfs/dir-lookup.c | 11 ++++------- libdiskfs/disk-pager.c | 1 - libdiskfs/init-first.c | 13 +++++-------- libdiskfs/init-init.c | 4 ---- libdiskfs/init-main.c | 3 --- libdiskfs/init-startup.c | 6 ------ 12 files changed, 9 insertions(+), 104 deletions(-) diff --git a/console/display.c b/console/display.c index 81b7dc6..98c70f5 100644 --- a/console/display.c +++ b/console/display.c @@ -302,7 +302,6 @@ free_modreqs (struct modreq *mr) struct modreq *tmp; for (; mr; mr = tmp) { - error_t err; mach_port_t old; /* Cancel the dead-name notification. */ err = mach_port_request_notification (mach_task_self (), mr->port, diff --git a/daemons/getty.c b/daemons/getty.c index 8019ca7..40ad4d7 100644 --- a/daemons/getty.c +++ b/daemons/getty.c @@ -200,8 +200,6 @@ main (int argc, char **argv) asprintf (&arg, "TERM=%s", tt ? tt->ty_type : "unknown"); - printf ("execute %s\n", _PATH_LOGIN); - if (tt && strcmp (tt->ty_type, "dialup") == 0) /* Dialup lines time out (which is login's default). */ execl (_PATH_LOGIN, "login", "-e", arg, NULL); diff --git a/daemons/runttys.c b/daemons/runttys.c index 1071c5c..7efb7b7 100644 --- a/daemons/runttys.c +++ b/daemons/runttys.c @@ -112,11 +112,8 @@ setup_terminal (struct terminal *t, struct ttyent *tt) else { t->getty_argv = make_args (line); - error (0, 0, "getty: %s", line); free (line); } - if (tt->ty_window) - error (0, 0, "ty_window: %s", tt->ty_window); t->window_argv = tt->ty_window ? make_args (tt->ty_window) : 0; } else @@ -282,8 +279,6 @@ startup_ttys (void) for (i = 0; i < nttys; i++) if (ttys[i].on) { - error (0, 0, "startup terminal: %s %s", - ttys[i].getty_argv[0], ttys[i].getty_argv[1]); fail = startup_terminal (&ttys[i]); if (!fail) didone = 1; @@ -471,7 +466,6 @@ main () { error_t waiterr; pid_t pid = waitpid (WAIT_ANY, NULL, WUNTRACED); - error (0, 0, "one tty is stopped by some signal"); waiterr = errno; /* Elicit a SIGLOST now if the console (on our stderr, i.e. fd 2) has diff --git a/devnode/ChangeLog b/devnode/ChangeLog deleted file mode 100644 index 54ae55f..0000000 --- a/devnode/ChangeLog +++ /dev/null @@ -1,34 +0,0 @@ -2008-09-26 Zheng Da <[email protected]> - - * README: Update. - - * devnode.c (args_doc): New variable. - (options): Remove '-d' and change the description of '-n'. - (parse_opt): Get the device in ARGP_KEY_ARG instead of from '-d'. - (main): Set args_doc to the field of argp. - -2008-08-28 Zheng Da <[email protected]> - - * devnode.c (ds_device_open): Return the error instead of stopping the - translator. - -2008-08-20 Zheng Da <[email protected]> - - * devnode.c (ds_device_open): Test device_name before using it. - - * util.h (DEBUG): Remove the macro. - -2008-08-18 Zheng Da <[email protected]> - - * README: New file. - - * devnode.c (options): Replace the option '-i' with '-d'. - (parse_opt): Handle the option '-d'. - -2008-08-17 Zheng Da <[email protected]> - - * Makefile: New file. - - * util.h: New file. - - * devnode.c: New file. diff --git a/ext2fs/ext2fs.c b/ext2fs/ext2fs.c index 6ccd31f..03c9eed 100644 --- a/ext2fs/ext2fs.c +++ b/ext2fs/ext2fs.c @@ -167,30 +167,11 @@ main (int argc, char **argv) error_t err; mach_port_t bootstrap; - vm_address_t addr; - vm_size_t size; - vm_prot_t protection; - vm_prot_t max_protection; - vm_inherit_t inheritance; - boolean_t shared; - mach_port_t object_name; - vm_offset_t offset; - /* Initialize the diskfs library, parse arguments, and open the store. This starts the first diskfs thread for us. */ store = diskfs_init_main (&startup_argp, argc, argv, &store_parsed, &bootstrap); - err = vm_region (mach_task_self (), &addr, &size, &protection, - &max_protection, &inheritance, &shared, &object_name, - &offset); - if (!err) - { - printf ("testing vm_region: object name: %d\n", object_name); - fflush (stdout); - mach_port_deallocate (mach_task_self (), object_name); - } - if (store->size < SBLOCK_OFFS + SBLOCK_SIZE) ext2_panic ("device too small for superblock (%Ld bytes)", store->size); if (store->log2_blocks_per_page < 0) diff --git a/libdiskfs/boot-start.c b/libdiskfs/boot-start.c index de72b33..731d8c6 100644 --- a/libdiskfs/boot-start.c +++ b/libdiskfs/boot-start.c @@ -161,15 +161,11 @@ diskfs_start_bootstrap () pthread_mutex_init (&execstartlock, NULL); pthread_cond_init (&execstarted, NULL); pthread_mutex_lock (&execstartlock); - printf ("libdiskfs: check point 7.1\n"); - fflush (stdout); start_execserver (); pthread_cond_wait (&execstarted, &execstartlock); pthread_mutex_unlock (&execstartlock); assert (diskfs_exec_ctl != MACH_PORT_NULL); - printf ("libdiskfs: check point 7.2\n"); - fflush (stdout); /* Contact the exec server. */ err = fsys_getroot (diskfs_exec_ctl, root_pt, MACH_MSG_TYPE_COPY_SEND, idlist, 3, idlist, 3, 0, @@ -179,8 +175,6 @@ diskfs_start_bootstrap () assert (retry_name[0] == '\0'); assert (diskfs_exec != MACH_PORT_NULL); - printf ("libdiskfs: check point 7.3\n"); - fflush (stdout); /* Attempt to set the active translator for the exec server so that filesystems other than the bootstrap can find it. */ err = dir_lookup (root_pt, _SERVERS_EXEC, O_NOTRANS, 0, @@ -195,8 +189,6 @@ diskfs_start_bootstrap () assert (retry == FS_RETRY_NORMAL); assert (retry_name[0] == '\0'); assert (execnode != MACH_PORT_NULL); - printf ("libdiskfs: check point 7.4\n"); - fflush (stdout); err = file_set_translator (execnode, 0, FS_TRANS_SET, 0, 0, 0, diskfs_exec_ctl, MACH_MSG_TYPE_COPY_SEND); mach_port_deallocate (mach_task_self (), diskfs_exec_ctl); @@ -206,9 +198,6 @@ diskfs_start_bootstrap () diskfs_exec_ctl = MACH_PORT_NULL; /* Not used after this. */ } - printf ("libdiskfs: check point 7.5\n"); - fflush (stdout); - /* Cache the exec server port for file_exec to use. */ _hurd_port_set (&_diskfs_exec_portcell, diskfs_exec); @@ -406,8 +395,6 @@ diskfs_execboot_fsys_startup (mach_port_t port, int flags, struct peropen *rootpo; mach_port_t rootport; - printf ("libdiskfs: check point 8\n"); - fflush (stdout); if (!(pt = ports_lookup_port (diskfs_port_bucket, port, diskfs_execboot_class))) return EOPNOTSUPP; diff --git a/libdiskfs/dir-lookup.c b/libdiskfs/dir-lookup.c index d3bc382..75df9b8 100644 --- a/libdiskfs/dir-lookup.c +++ b/libdiskfs/dir-lookup.c @@ -54,8 +54,8 @@ diskfs_S_dir_lookup (struct protid *dircred, int mustbedir = 0; size_t amt; int type; - struct protid *newpi; - struct peropen *newpo; + struct protid *newpi = 0; + struct peropen *newpo = 0; if (!dircred) return EOPNOTSUPP; @@ -516,17 +516,13 @@ diskfs_S_dir_lookup (struct protid *dircred, if (! err) { + newpo = 0; if (flags & O_EXLOCK) err = fshelp_acquire_lock (&np->userlock, &newpi->po->lock_status, &np->lock, LOCK_EX); else if (flags & O_SHLOCK) err = fshelp_acquire_lock (&np->userlock, &newpi->po->lock_status, &np->lock, LOCK_SH); - if (error) - { - mutex_unlock(&np->lock); - ports_port_deref (newpi); /* Get rid of NEWPI. */ - } } if (! err) @@ -549,6 +545,7 @@ diskfs_S_dir_lookup (struct protid *dircred, *returned_port = ports_get_right (newpi); ports_port_deref (newpi); + newpi = 0; } out: diff --git a/libdiskfs/disk-pager.c b/libdiskfs/disk-pager.c index e069231..434ceed 100644 --- a/libdiskfs/disk-pager.c +++ b/libdiskfs/disk-pager.c @@ -20,7 +20,6 @@ #include "diskfs-pager.h" #include <hurd/sigpreempt.h> #include <error.h> -#include <string.h> __thread struct disk_image_user *diskfs_exception_diu; diff --git a/libdiskfs/init-first.c b/libdiskfs/init-first.c index d4ca9f0..8f27eff 100644 --- a/libdiskfs/init-first.c +++ b/libdiskfs/init-first.c @@ -34,14 +34,11 @@ master_thread_function (void *demuxer) do { - ports_manage_port_operations_one_thread (diskfs_port_bucket, - (ports_demuxer_type) demuxer, - thread_timeout); -// ports_manage_port_operations_multithread (diskfs_port_bucket, -// (ports_demuxer_type) demuxer, -// thread_timeout, -// server_timeout, -// 0); + ports_manage_port_operations_multithread (diskfs_port_bucket, + (ports_demuxer_type) demuxer, + thread_timeout, + server_timeout, + 0); err = diskfs_shutdown (0); } while (err); diff --git a/libdiskfs/init-init.c b/libdiskfs/init-init.c index 7b26d99..357960b 100644 --- a/libdiskfs/init-init.c +++ b/libdiskfs/init-init.c @@ -59,8 +59,6 @@ diskfs_init_diskfs (void) { error_t err; - printf ("libdiskfs: check point 1\n"); - fflush (stdout); if (diskfs_boot_filesystem ()) /* This is a boot filesystem, we have to do some things specially. */ { @@ -79,8 +77,6 @@ diskfs_init_diskfs (void) else err = maptime_map (0, 0, &diskfs_mtime); - printf ("libdiskfs: check point 2: %s\n", strerror (err)); - fflush (stdout); if (err) return err; diff --git a/libdiskfs/init-main.c b/libdiskfs/init-main.c index 365b1d9..3e03ae4 100644 --- a/libdiskfs/init-main.c +++ b/libdiskfs/init-main.c @@ -48,9 +48,6 @@ diskfs_init_main (struct argp *startup_argp, host priv ports are set for booting. */ diskfs_console_stdio (); - printf ("libdiskfs: boot command line: %s\n", diskfs_boot_command_line); - fflush (stdout); - if (diskfs_boot_filesystem ()) /* We are the bootstrap filesystem. */ *bootstrap = MACH_PORT_NULL; diff --git a/libdiskfs/init-startup.c b/libdiskfs/init-startup.c index a61d9e5..14da003 100644 --- a/libdiskfs/init-startup.c +++ b/libdiskfs/init-startup.c @@ -88,8 +88,6 @@ diskfs_startup_diskfs (mach_port_t bootstrap, int flags) diskfs_nput (old); } - printf ("libdiskfs: check point 5\n"); - fflush (stdout); if (bootstrap != MACH_PORT_NULL) { err = ports_create_port (diskfs_control_class, diskfs_port_bucket, @@ -114,14 +112,10 @@ diskfs_startup_diskfs (mach_port_t bootstrap, int flags) { realnode = MACH_PORT_NULL; - printf ("libdiskfs: check point 7\n"); - fflush (stdout); /* We are the bootstrap filesystem; do special boot-time setup. */ diskfs_start_bootstrap (); } - printf ("libdiskfs: check point 8\n"); - fflush (stdout); if (diskfs_default_sync_interval) /* Start 'em sync'n */ diskfs_set_sync_interval (diskfs_default_sync_interval); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/hurd.git
