[Pkg-wmaker-commits] [wmbiff] 05/11: much prefer if wmgeneral proclaimed that it would not modify argv; I think it's even true

[Doug Torrance]

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

dtorrance-guest pushed a commit to tag wmbiff_0_4_14
in repository wmbiff.

commit 524098c4470734e6264e9ca436997c6365b8b7f3
Author: bluehal <bluehal>
Date:   Sat Feb 8 03:42:02 2003 +0000

    much prefer if wmgeneral proclaimed that it would not modify argv; I think it's even true
---
 wmgeneral/wmgeneral.c | 10 +++++-----
 wmgeneral/wmgeneral.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wmgeneral/wmgeneral.c b/wmgeneral/wmgeneral.c
index 334ee7b..d9aa605 100644
--- a/wmgeneral/wmgeneral.c
+++ b/wmgeneral/wmgeneral.c
@@ -446,7 +446,7 @@ void setMaskXY(int x, int y)
 /*******************************************************************************\
 |* openXwindow																   *|
 \*******************************************************************************/
-void openXwindow(int argc, char *argv[], const char *pixmap_bytes_bkg[],
+void openXwindow(int argc, const char *argv[], const char *pixmap_bytes_bkg[],
 				 const char *pixmap_bytes_src[],
 				 char *pixmask_bits,
 				 int pixmask_width, int pixmask_height, int notWithdrawn)
@@ -454,14 +454,14 @@ void openXwindow(int argc, char *argv[], const char *pixmap_bytes_bkg[],
 
 	unsigned int borderwidth = 1;
 	XClassHint classHint;
-	char *display_name = NULL;
-	char *wname = argv[0];
+	const char *display_name = NULL;
+	char *wname = strdup(argv[0]);
 	XTextProperty name;
 
 	XGCValues gcv;
 	unsigned long gcm;
 
-	char *geometry = NULL;
+	const char *geometry = NULL;
 
 	int dummy = 0;
 	int i;
@@ -568,7 +568,7 @@ void openXwindow(int argc, char *argv[], const char *pixmap_bytes_bkg[],
 
 	XSetWMHints(display, win, &mywmhints);
 
-	XSetCommand(display, win, argv, argc);
+	XSetCommand(display, win, (char **)argv, argc);
 	XMapWindow(display, win);
 
 	if (geometry) {
diff --git a/wmgeneral/wmgeneral.h b/wmgeneral/wmgeneral.h
index 202799a..ec6f4d2 100644
--- a/wmgeneral/wmgeneral.h
+++ b/wmgeneral/wmgeneral.h
@@ -46,7 +46,7 @@ void AddMouseRegion(unsigned int rgn_index, int left, int top, int right,
 					int bottom);
 int CheckMouseRegion(int x, int y);
 
-void openXwindow(int argc, char *argv[], const char **,
+void openXwindow(int argc, const char *argv[], const char **,
 				 const char **, char *, int, int, int);
 void RedrawWindow(void);
 void RedrawWindowXY(int x, int y);

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