[Cmake-commits] [cmake-commits] king committed SharedForward.h.in 1.11 1.12

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv2161/Source/kwsys

Modified Files:
	SharedForward.h.in 
Log Message:
COMP: Fix KWSys SharedForward pointer const-ness

This adds const-ness and casts where necessary to avoid pointer
conversion warnings.


Index: SharedForward.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SharedForward.h.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** SharedForward.h.in	27 Sep 2008 12:04:13 -0000	1.11
--- SharedForward.h.in	8 Jul 2009 19:09:10 -0000	1.12
***************
*** 483,487 ****
  /*--------------------------------------------------------------------------*/
  /* Functions to execute a child process.  */
! static void kwsys_shared_forward_execvp(const char* cmd, char* const* argv)
  {
  #ifdef KWSYS_SHARED_FORWARD_ESCAPE_ARGV
--- 483,488 ----
  /*--------------------------------------------------------------------------*/
  /* Functions to execute a child process.  */
! static void kwsys_shared_forward_execvp(const char* cmd,
!                                         char const* const* argv)
  {
  #ifdef KWSYS_SHARED_FORWARD_ESCAPE_ARGV
***************
*** 489,493 ****
    int argc = 0;
    {
!   char* const* argvc;
    for(argvc = argv; *argvc; ++argvc,++argc) {}
    }
--- 490,494 ----
    int argc = 0;
    {
!   char const* const* argvc;
    for(argvc = argv; *argvc; ++argvc,++argc) {}
    }
***************
*** 514,521 ****
    _execvp(cmd, argv);
  #elif defined(__MINGW32__)
-    /* Avoid incompatible pointer warning with a cast.  */
-   execvp(cmd, (char const* const*)argv);
- #else
    execvp(cmd, argv);
  #endif
  }
--- 515,521 ----
    _execvp(cmd, argv);
  #elif defined(__MINGW32__)
    execvp(cmd, argv);
+ #else
+   execvp(cmd, (char* const*)argv);
  #endif
  }
***************
*** 801,808 ****
  /*--------------------------------------------------------------------------*/
  /* Function to print why execution of a command line failed.  */
! static void kwsys_shared_forward_print_failure(char** argv)
  {
    char msg[KWSYS_SHARED_FORWARD_MAXPATH];
!   char** arg = argv;
    kwsys_shared_forward_strerror(msg);
    fprintf(stderr, "Error running");
--- 801,808 ----
  /*--------------------------------------------------------------------------*/
  /* Function to print why execution of a command line failed.  */
! static void kwsys_shared_forward_print_failure(char const* const* argv)
  {
    char msg[KWSYS_SHARED_FORWARD_MAXPATH];
!   char const* const* arg = argv;
    kwsys_shared_forward_strerror(msg);
    fprintf(stderr, "Error running");
***************
*** 819,824 ****
  /*--------------------------------------------------------------------------*/
  /* Main driver function to be called from main.  */
! static int @KWSYS_NAMESPACE at _shared_forward_to_real(int argc, char** argv)
  {
    /* Get the directory containing this executable.  */
    char self_path[KWSYS_SHARED_FORWARD_MAXPATH];
--- 819,825 ----
  /*--------------------------------------------------------------------------*/
  /* Main driver function to be called from main.  */
! static int @KWSYS_NAMESPACE at _shared_forward_to_real(int argc, char** argv_in)
  {
+   char const** argv = (char const**)argv_in;
    /* Get the directory containing this executable.  */
    char self_path[KWSYS_SHARED_FORWARD_MAXPATH];
***************
*** 878,882 ****
  # if defined(KWSYS_SHARED_FORWARD_LDD)
          /* Use the named ldd-like executable and arguments.  */
!         char* ldd_argv[] = {KWSYS_SHARED_FORWARD_LDD, 0, 0};
          ldd_argv[KWSYS_SHARED_FORWARD_LDD_N] = exe;
          kwsys_shared_forward_execvp(ldd_argv[0], ldd_argv);
--- 879,883 ----
  # if defined(KWSYS_SHARED_FORWARD_LDD)
          /* Use the named ldd-like executable and arguments.  */
!         char const* ldd_argv[] = {KWSYS_SHARED_FORWARD_LDD, 0, 0};
          ldd_argv[KWSYS_SHARED_FORWARD_LDD_N] = exe;
          kwsys_shared_forward_execvp(ldd_argv[0], ldd_argv);