2005-01-21 21:51 Alexander Malmberg <alexander@malmberg.org>

Various warning and whitespace cleanups.

	* Headers/x11/XGServerWindow.h,
 	* Source/art/ftfont.m,
	* Source/gsc/GSGState.m,
	* Source/win32/WIN32Server.m,
	* Source/x11/XGDragView.m,
	* Source/x11/XGServerEvent.m,
	* Source/x11/XGServerWindow.m: Change signedness of various
	variables.
	* Tools/gpbs.m: Add missing ctype.h include.
	* Source/x11/XGDrawView.m (-_setCursor): Initialize variables.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@20591 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,18 @@
+2005-01-21 21:51  Alexander Malmberg  <alexander@malmberg.org>
+
+	Various warning and whitespace cleanups.
+
+	* Headers/x11/XGServerWindow.h,
+ 	* Source/art/ftfont.m,
+	* Source/gsc/GSGState.m,
+	* Source/win32/WIN32Server.m,
+	* Source/x11/XGDragView.m,
+	* Source/x11/XGServerEvent.m,
+	* Source/x11/XGServerWindow.m: Change signedness of various
+	variables.
+	* Tools/gpbs.m: Add missing ctype.h include.
+	* Source/x11/XGDrawView.m (-_setCursor): Initialize variables.
+
 2005-01-20 22:39  Alexander Malmberg  <alexander@malmberg.org>
 
 	* Source/art/ARTContext.m (-initWithContextInfo:): Enable stroke

Headers/x11/XGServerWindow.h

@@ -119,6 +119,6 @@ typedef struct _gswindow_device_t {
 @end
 
 extern Pixmap
-xgps_cursor_mask(Display *xdpy, Drawable draw, const char *data, 
+xgps_cursor_mask(Display *xdpy, Drawable draw, const unsigned char *data,
 		 int w, int h, int colors);
 #endif

Source/art/ftfont.m

@@ -314,7 +314,7 @@ static void add_face(NSString *family, int family_weight,
 	BOOL from_nfont)
 {
   FTFaceInfo *fi;
-  int weight;
+  unsigned int weight;
   unsigned int traits;
 
   NSString *fontName;
@@ -370,7 +370,7 @@ static void add_face(NSString *family, int family_weight,
     }
   else if (!from_nfont)
     { /* try to guess something for .font packages */
-      int dummy;
+      unsigned int dummy;
       int split = traits_from_string(family,&dummy,&dummy);
       rawFaceName = faceName = [family substringFromIndex: split];
       family = [family substringToIndex: split];
@@ -981,7 +981,7 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
 /*	NSLog(@"drawString: '%s' at: %i:%i  to: %i:%i:%i:%i:%p\n",
 		s, x, y, x0, y0, x1, y1, buf);*/
 
-  for (c = s; *c; c++)
+  for (c = (const unsigned char *)s; *c; c++)
     {
 /* TODO: do the same thing in outlineString:... */
       ch = *c;

Source/gsc/GSGState.m

@@ -375,7 +375,7 @@ typedef enum {
 {
   NSPoint point = [path currentPoint];
   unichar *uch;
-  int ulen;
+  unsigned int ulen;
   int i;
 
   /* 

Source/win32/WIN32Server.m

@@ -736,7 +736,7 @@ DWORD windowStyleForGSStyle(unsigned int style)
 }
 
 - (void) imagecursor: (NSPoint)hotp : (int) w :  (int) h 
-		    : (int)colors : (const char *)image : (void **)cid
+		    : (int)colors : (const unsigned char *)image : (void **)cid
 {
   /*
   HCURSOR cur;

Source/x11/XGDragView.m

@@ -469,7 +469,7 @@ static	XGDragView	*sharedDragView = nil;
   if (cursors == nil)
     cursors = RETAIN([NSMutableDictionary dictionary]);
   
-  name = nil;
+  name = iname = nil;
   newCursor = nil;
   switch (mask)
     {
@@ -1099,7 +1099,7 @@ static	XGDragView	*sharedDragView = nil;
 					  Y: (int) y
 {
   Window *children;
-  int nchildren;
+  unsigned int nchildren;
   Window  result = None;
   Window  ignore, child2, root;
   Display *display = XDPY;

Source/x11/XGServerEvent.m

@@ -1241,8 +1241,8 @@ static int check_modifier (XEvent *xEvent, KeySym key_sym,
 		while (new_parent && (new_parent != cWin->root)) {
 		  Window root;
 		  Window *children;
-		  int nchildren;
-	    
+		  unsigned int nchildren;
+
 		  parent = new_parent;
 		  NSLog(@"QueryTree window is %d (root %d cwin root %d)", 
 			parent, root, cWin->root);

Source/x11/XGServerWindow.m

@@ -195,10 +195,6 @@ typedef struct {
 #define _XA_MOTIF_WM_HINTS "_MOTIF_WM_HINTS"
 
 
-Pixmap
-xgps_cursor_mask(Display *xdpy, Drawable draw, const char *data,
-                  int w, int h, int colors);
-
 /* Now the code */
 
 /* Set the style `styleMask' for the XWindow `window' using motif
@@ -586,7 +582,8 @@ NSDebugLLog(@"Frame", @"X2O %d, %@, %@", win->number,
 
 - (gswindow_device_t *)_rootWindowForScreen: (int)screen
 {
-  int x, y, width, height;
+  int x, y;
+  unsigned int width, height;
   gswindow_device_t *window;
 
   /* Screen number is negative to avoid conflict with windows */
@@ -1500,7 +1497,7 @@ static BOOL didCreatePixmaps;
   data = [rep bitmapData];
   screen = [[[self screenList] objectAtIndex: 0] intValue];
   xIconPixmap = XCreatePixmap(dpy,
-                      [self xDisplayRootWindowForScreen:screen],
+                      [self xDisplayRootWindowForScreen: screen],
                       [rep pixelsWide], [rep pixelsHigh],
                       DefaultDepth(dpy, screen));
   pixgc = XCreateGC(dpy, xIconPixmap, 0, NULL);
@@ -2510,7 +2507,7 @@ static BOOL   cursor_hidden = NO;
 #define ALPHA_THRESHOLD 158
 
 Pixmap
-xgps_cursor_mask(Display *xdpy, Drawable draw, const char *data, 
+xgps_cursor_mask(Display *xdpy, Drawable draw, const unsigned char *data,
 		  int w, int h, int colors)
 {
   int j, i;
@@ -2701,7 +2698,8 @@ xgps_cursor_image(Display *xdpy, Drawable draw, const unsigned char *data,
     *cid = (void *)cursor;
 }
 
-- (void) imagecursor: (NSPoint)hotp : (int) w :  (int) h : (int)colors : (const char *)image : (void **)cid
+- (void) imagecursor: (NSPoint)hotp : (int) w :  (int) h : (int)colors
+		    : (const unsigned char *)image : (void **)cid
 {
   Cursor cursor;
   Pixmap source, mask;

Tools/gpbs.m

@@ -33,6 +33,7 @@
 
 #include <signal.h>
 #include <unistd.h>
+#include <ctype.h>
 
 #ifdef __MINGW__
 #include	"process.h"