[hurd] 21/75: Drop spurious debugging or outdated changes

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch dde
in repository hurd.

commit 9d34d52455c458ac6471121ba225491e5119f712
Author: Samuel Thibault <address@hidden>
Date:   Sun Nov 29 13:41:34 2015 +0100

    Drop spurious debugging or outdated changes
---
 libnetfs/dir-lookup.c          |  1 -
 libports/get-right.c           |  2 +-
 libports/manage-multithread.c  |  1 -
 libstore/argp.c                |  2 --
 libstore/open.c                |  2 --
 libthreads/cprocs.c            |  1 -
 libthreads/cthread_internals.h |  2 +-
 libthreads/cthreads.c          | 20 --------------------
 8 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/libnetfs/dir-lookup.c b/libnetfs/dir-lookup.c
index 4849547..7ca526b 100644
--- a/libnetfs/dir-lookup.c
+++ b/libnetfs/dir-lookup.c
@@ -460,7 +460,6 @@ netfs_S_dir_lookup (struct protid *diruser,
     error = errno;
 
   *retry_port = ports_get_right (newpi);
-  fprintf (stderr, "dereference a port\n");
   ports_port_deref (newpi);
 
  out:
diff --git a/libports/get-right.c b/libports/get-right.c
index c8a6434..8681f46 100644
--- a/libports/get-right.c
+++ b/libports/get-right.c
@@ -49,9 +49,9 @@ ports_get_right (void *port)
                                            pi->port_right,
                                            MACH_MSG_TYPE_MAKE_SEND_ONCE,
                                            &foo);
+      assert_perror (err);
       if (foo != MACH_PORT_NULL)
        mach_port_deallocate (mach_task_self (), foo);
-      assert_perror (err);
     }
   pthread_mutex_unlock (&_ports_lock);
   return pi->port_right;
diff --git a/libports/manage-multithread.c b/libports/manage-multithread.c
index 971a867..60743d9 100644
--- a/libports/manage-multithread.c
+++ b/libports/manage-multithread.c
@@ -18,7 +18,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
-#include <stdio.h>
 #include "ports.h"
 #include <assert.h>
 #include <error.h>
diff --git a/libstore/argp.c b/libstore/argp.c
index 9c66628..73146a8 100644
--- a/libstore/argp.c
+++ b/libstore/argp.c
@@ -174,8 +174,6 @@ store_parsed_open (const struct store_parsed *parsed, int 
flags,
       const struct store_class *type = parsed->type;
       if (type->open)
        {
-         fprintf (stderr, "device type: %s\n", type->name);
-         fflush (stderr);
          if (parsed->name_prefix)
            /* If there's a name prefix, we prefix any names we open with that
               and a colon.  */
diff --git a/libstore/open.c b/libstore/open.c
index b0c3c7e..5c00e10 100644
--- a/libstore/open.c
+++ b/libstore/open.c
@@ -18,7 +18,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */
 
-#include <stdio.h>
 #include <fcntl.h>
 #include <hurd.h>
 
@@ -38,7 +37,6 @@ store_open (const char *name, int flags,
   int open_flags = (flags & STORE_HARD_READONLY) ? O_RDONLY : O_RDWR;
   file_t node = file_name_lookup (name, open_flags, 0);
 
-  fprintf (stderr, "store_open: %s\n", name);
   if (node == MACH_PORT_NULL && !(flags & STORE_HARD_READONLY)
       && (errno == EACCES || errno == EROFS))
     {
diff --git a/libthreads/cprocs.c b/libthreads/cprocs.c
index 812e84f..5459d7d 100644
--- a/libthreads/cprocs.c
+++ b/libthreads/cprocs.c
@@ -234,7 +234,6 @@
 #include <mach/message.h>
 #include <hurd/threadvar.h>    /* GNU */
 #include <assert.h>
-#include <stdio.h>
 
 /*
  * Port_entry's are used by cthread_mach_msg to store information
diff --git a/libthreads/cthread_internals.h b/libthreads/cthread_internals.h
index 5345611..81e3b91 100644
--- a/libthreads/cthread_internals.h
+++ b/libthreads/cthread_internals.h
@@ -237,7 +237,7 @@ extern void mach_error();
 #ifndef        ASSERT
 #define ASSERT(x)
 #endif
-#define TRACE(x) do {x; fflush (stdout);} while (0)
+#define TRACE(x)
 
 /*
  * What we do to yield the processor:
diff --git a/libthreads/cthreads.c b/libthreads/cthreads.c
index bd2ab9e..1361b8b 100644
--- a/libthreads/cthreads.c
+++ b/libthreads/cthreads.c
@@ -262,26 +262,6 @@ cthread_init(void)
  */
 vm_offset_t (*_cthread_init_routine)(void) = cthread_init;
 
-#define __libc_tsd_get(KEY) (__test_libc_tsd_##KEY)
-#define __libc_tsd_set(KEY, VALUE)     (__test_libc_tsd_##KEY = (VALUE))
-#define _NL_CURRENT_LOCALE      ((__locale_t) __libc_tsd_get (LOCALE))
-__thread void *__test_libc_tsd_LOCALE;
-//extern struct __locale_struct _nl_global_locale attribute_hidden;
-locale_t
-test_uselocale (locale_t newloc)
-{
-  locale_t oldloc = _NL_CURRENT_LOCALE;
-  return oldloc;
-
-//  if (newloc != NULL)
-//    {
-//      const locale_t locobj
-//     = newloc == LC_GLOBAL_LOCALE ? &_nl_global_locale : newloc;
-//      __libc_tsd_set (LOCALE, locobj);
-//    }
-//
-//  return oldloc == &_nl_global_locale ? LC_GLOBAL_LOCALE : oldloc;
-}
 
 /*
  * Procedure invoked at the base of each cthread.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git