public inbox for archer-commits@sourceware.org
help / color / mirror / Atom feed
* [SCM]  archer-muller-windows-multi:  * shorten gdb_windows_conv... function names to gdb_win_conv...
@ 2011-03-18 16:30 muller
  0 siblings, 0 replies; only message in thread
From: muller @ 2011-03-18 16:30 UTC (permalink / raw)
  To: archer-commits

The branch, archer-muller-windows-multi has been updated
       via  d62ea4be02174c57e9b31b1df478bae5ea48ac08 (commit)
       via  f069b0acec073c3bd731a617fef3811489ea28d3 (commit)
      from  a163f97f62bb3e15f0454377978a8069779e91e0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit d62ea4be02174c57e9b31b1df478bae5ea48ac08
Author: Pierre Muller <muller@ics.u-strasbg.fr>
Date:   Fri Mar 18 17:30:10 2011 +0100

     * shorten gdb_windows_conv... function names to gdb_win_conv...

commit f069b0acec073c3bd731a617fef3811489ea28d3
Author: Pierre Muller <muller@ics.u-strasbg.fr>
Date:   Fri Mar 18 17:28:32 2011 +0100

     * Add POSTCOMPILE to windows-hdep.o rule

-----------------------------------------------------------------------

Summary of changes:
 gdb/Makefile.in           |    2 +-
 gdb/common/windows-hdep.c |    8 ++++----
 gdb/common/windows-hdep.h |    8 ++++----
 gdb/gdbserver/win32-low.c |   14 +++++++-------
 gdb/nto-tdep.c            |    6 +++---
 gdb/remote-fileio.c       |    8 ++++----
 gdb/windows-nat.c         |   30 ++++++++++++++----------------
 7 files changed, 37 insertions(+), 39 deletions(-)

First 500 lines of diff:
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index fa8f72d..2783af9 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1914,7 +1914,7 @@ signals.o: $(srcdir)/common/signals.c
 
 windows-hdep.o: $(srcdir)/common/windows-hdep.c
 	$(COMPILE) $(srcdir)/common/windows-hdep.c
-
+	$(POSTCOMPILE)
 
 #
 # gdb/tui/ dependencies
diff --git a/gdb/common/windows-hdep.c b/gdb/common/windows-hdep.c
index 6961587..640a099 100644
--- a/gdb/common/windows-hdep.c
+++ b/gdb/common/windows-hdep.c
@@ -14,8 +14,8 @@
 #include "windows-hdep.h"
 
 int
-gdb_windows_conv_path (conv_type oper, const void *from,
-		       void * to, int size)
+gdb_win_conv_path (conv_type oper, const void *from,
+		   void * to, int size)
 
 {
 #ifdef USE_MINGW_CONV
@@ -128,8 +128,8 @@ gdb_windows_conv_path (conv_type oper, const void *from,
 /* Analogeous function for PATH style lists.  */
 
 int
-gdb_windows_conv_path_list (conv_type oper, const void *from,
-			    void * to, int size)
+gdb_win_conv_path_list (conv_type oper, const void *from,
+			void * to, int size)
 
 {
 #ifdef USE_MINGW_CONV
diff --git a/gdb/common/windows-hdep.h b/gdb/common/windows-hdep.h
index 7e7d6c4..3564c6a 100644
--- a/gdb/common/windows-hdep.h
+++ b/gdb/common/windows-hdep.h
@@ -112,13 +112,13 @@ typedef enum
    Returns size of converted string in characters or
    -1 if there was an error.  */
 
-extern int gdb_windows_conv_path (conv_type oper, const void *from,
-				  void * to, int size);
+extern int gdb_win_conv_path (conv_type oper, const void *from,
+			      void * to, int size);
 
 /* Analogeous function for PATH style lists.  */
 
-extern int gdb_windows_conv_path_list (conv_type oper, const void *from,
-				       void * to, int size);
+extern int gdb_win_conv_path_list (conv_type oper, const void *from,
+				   void * to, int size);
 
 #ifdef NEED_SLEEP_SUBSTITUTE
 extern int sleep (int);
diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c
index fcd829f..ed4bc4c 100644
--- a/gdb/gdbserver/win32-low.c
+++ b/gdb/gdbserver/win32-low.c
@@ -537,17 +537,17 @@ win32_create_inferior (char *program, char **program_args)
   path_ptr = getenv ("PATH");
   if (path_ptr)
     {
-      int len = gdb_windows_conv_path_list (WINDOWS_POSIX_TO_NATIVE_A,
-					    path_ptr, NULL, 0);
+      int len = gdb_win_conv_path_list (WINDOWS_POSIX_TO_NATIVE_A,
+					path_ptr, NULL, 0);
       orig_path = alloca (strlen (path_ptr) + 1);
       new_path = alloca (len);
       strcpy (orig_path, path_ptr);
-      gdb_windows_conv_path_list (WINDOWS_POSIX_TO_NATIVE_A, path_ptr,
-				  new_path, len);
+      gdb_win_conv_path_list (WINDOWS_POSIX_TO_NATIVE_A, path_ptr,
+			      new_path, len);
       setenv ("PATH", new_path, 1);
     }
-  gdb_windows_conv_path (WINDOWS_POSIX_TO_NATIVE_A, program, real_path,
-			 MAXPATHLEN);
+  gdb_win_conv_path (WINDOWS_POSIX_TO_NATIVE_A, program, real_path,
+		     MAXPATHLEN);
   program = real_path;
 #endif
 
@@ -929,7 +929,7 @@ win32_add_one_solib (const char *name, CORE_ADDR load_addr)
     }
 #endif
 
-  gdb_windows_conv_path (WINDOWS_NATIVE_A_TO_POSIX, buf, buf2, MAX_PATH + 1);
+  gdb_win_conv_path (WINDOWS_NATIVE_A_TO_POSIX, buf, buf2, MAX_PATH + 1);
 
   loaded_dll (buf2, load_addr);
 }
diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c
index b30c259..3e6a267 100644
--- a/gdb/nto-tdep.c
+++ b/gdb/nto-tdep.c
@@ -60,10 +60,10 @@ nto_target (void)
 #ifdef __CYGWIN__
   static char buf[PATH_MAX];
   if (p)
-    gdb_windows_conv_path (WINDOWS_NATIVE_A_TO_POSIX, p, buf, PATH_MAX);
+    gdb_win_conv_path (WINDOWS_NATIVE_A_TO_POSIX, p, buf, PATH_MAX);
   else
-    gdb_windows_conv_path (WINDOWS_NATIVE_A_TO_POSIX, default_nto_target,
-			   buf, PATH_MAX);
+    gdb_win_conv_path (WINDOWS_NATIVE_A_TO_POSIX, default_nto_target, buf,
+		       PATH_MAX);
   return buf;
 #else
   return p ? p : default_nto_target;
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index 6f1012d..2d2a5e4 100644
--- a/gdb/remote-fileio.c
+++ b/gdb/remote-fileio.c
@@ -1008,10 +1008,10 @@ remote_fileio_func_rename (char *buf)
 		  char newfullpath[PATH_MAX];
 		  int len;
 
-		  gdb_windows_conv_path (WINDOWS_NATIVE_A_TO_POSIX, oldpath,
-					 oldfullpath, PATH_MAX);
-		  gdb_windows_conv_path (WINDOWS_NATIVE_A_TO_POSIX, newpath,
-					 newfullpath, PATH_MAX);
+		  gdb_win_conv_path (WINDOWS_NATIVE_A_TO_POSIX, oldpath,
+				     oldfullpath, PATH_MAX);
+		  gdb_win_conv_path (WINDOWS_NATIVE_A_TO_POSIX, newpath,
+				     newfullpath, PATH_MAX);
 		  len = strlen (oldfullpath);
 		  if (newfullpath[len] == '/'
 		      && !strncmp (oldfullpath, newfullpath, len))
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index c67c55b..092e0b7 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -750,8 +750,8 @@ get_module_name (LPVOID base_address, char *dll_name_ret)
 	  if (len == 0)
 	    error (_("Error getting dll name: %lu."), GetLastError ());
 	  /* Cygwin prefers that the path be in /x/y/z format.  */
-	  if (gdb_windows_conv_path (WINDOWS_NATIVE_TO_POSIX, pathbuf,
-				     dll_name_ret, __PMAX) < 0)
+	  if (gdb_win_conv_path (WINDOWS_NATIVE_TO_POSIX, pathbuf,
+				 dll_name_ret, __PMAX) < 0)
 	    error (_("Error converting dll name to POSIX: %d."), errno);
 	  return 1;	/* success */
 	}
@@ -891,8 +891,8 @@ windows_make_so (const char *name, LPVOID load_addr)
   strcpy (so->so_name, buf);
 #else
   if (buf[0])
-    gdb_windows_conv_path (WINDOWS_NATIVE_TO_POSIX, buf, so->so_name,
-			   SO_NAME_MAX_PATH_SIZE);
+    gdb_win_conv_path (WINDOWS_NATIVE_TO_POSIX, buf, so->so_name,
+		       SO_NAME_MAX_PATH_SIZE);
   else
     {
       char *rname = realpath (name, NULL);
@@ -2389,8 +2389,8 @@ static win_env conv_envvars[] =
 	flags |= DEBUG_PROCESS;
       else
 	flags |= DEBUG_ONLY_THIS_PROCESS;
-      if (gdb_windows_conv_path (WINDOWS_POSIX_TO_NATIVE, exec_file, real_path,
-				 __PMAX * sizeof (windows_buf_t)) < 0)
+      if (gdb_win_conv_path (WINDOWS_POSIX_TO_NATIVE, exec_file, real_path,
+			     __PMAX * sizeof (windows_buf_t)) < 0)
 	error (_("Error starting executable: %d"), errno);
       toexec = real_path;
 #ifdef USE_WIDE_WINAPI
@@ -2411,7 +2411,7 @@ static win_env conv_envvars[] =
 #ifdef __CYGWIN__
       if (!sh)
 	sh = "/bin/sh";
-      if (gdb_windows_conv_path (WINDOWS_POSIX_TO_NATIVE, sh, shell, __PMAX)
+      if (gdb_win_conv_path (WINDOWS_POSIX_TO_NATIVE, sh, shell, __PMAX)
 	    < 0)
       	error (_("Error starting executable via shell: %d"), errno);
 #else
@@ -2432,7 +2432,7 @@ static win_env conv_envvars[] =
       if (!sh || sh[0] == '\0')
 	error (_("Impossible to find a valid shell"));
       if (!use_windows_shell)
-	gdb_windows_conv_path (WINDOWS_NATIVE_TO_MSYS, exec_file,
+	gdb_win_conv_path (WINDOWS_NATIVE_TO_MSYS, exec_file,
 			       msys_exec_file, __PMAX);
       exec_file = msys_exec_file;
 # ifdef USE_WIDE_WINAPI
@@ -2488,21 +2488,19 @@ static win_env conv_envvars[] =
 	      conv_envvars[j].in_orig_val = in_env[i];
 	      if (conv_envvars[j].is_list)
 		{
-		  len = gdb_windows_conv_path_list (WINDOWS_POSIX_TO_NATIVE_A,
-						    &in_env[i][nlen], NULL, 0);
+		  len = gdb_win_conv_path_list (WINDOWS_POSIX_TO_NATIVE_A,
+						&in_env[i][nlen], NULL, 0);
 		  conv = (char *) alloca (len + nlen + 1);
 		  strcpy (conv, name);
-		  gdb_windows_conv_path_list (WINDOWS_POSIX_TO_NATIVE_A,
-					      &in_env[i][nlen],
-					      &conv[nlen], len);
+		  gdb_win_conv_path_list (WINDOWS_POSIX_TO_NATIVE_A,
+					  &in_env[i][nlen], &conv[nlen], len);
 		}
 	      else
 		{
 		  conv = (char *) alloca (__PMAX + nlen);
 		  strcpy (conv, name);
-		  gdb_windows_conv_path (WINDOWS_POSIX_TO_NATIVE_A,
-					 &in_env[i][nlen], &conv[nlen],
-					 __PMAX);
+		  gdb_win_conv_path (WINDOWS_POSIX_TO_NATIVE_A,
+				     &in_env[i][nlen], &conv[nlen], __PMAX);
 		}
 	      in_env[i] = conv;
 	    }


hooks/post-receive
--
Repository for Project Archer.


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2011-03-18 16:30 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-18 16:30 [SCM] archer-muller-windows-multi: * shorten gdb_windows_conv... function names to gdb_win_conv muller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).