> Changes by: [EMAIL PROTECTED] 02/09/24 11:55:22
>
> Log message:
> ulong->unsigned long
>
> Modified files:
> xc/lib/Xmu/:
> StrToCurs.c WidgetNode.c
Oh, already fixed :)
You can go on with:
./lib/font/bitmap/bitmapfunc.c
./lib/font/bitmap/bitmaputil.c
./lib/font/bitmap/bitscale.c
./lib/font/util/atom.c
./programs/mkfontdir/mkfontdir.c
./programs/twm/list.c
./programs/twm/menus.c
./programs/twm/parse.c
./programs/twm/util.c
./programs/xauth/process.c
patch is attached.
bye
ago
--
[EMAIL PROTECTED]
http://www.gotti.org ICQ: 126018723
Index: ./lib/font/bitmap/bitmapfunc.c
===================================================================
RCS file: /cvs/xc/lib/font/bitmap/bitmapfunc.c,v
retrieving revision 3.17
diff -u -r3.17 bitmapfunc.c
--- ./lib/font/bitmap/bitmapfunc.c 2002/09/19 13:21:58 3.17
+++ ./lib/font/bitmap/bitmapfunc.c 2002/09/24 21:07:58
@@ -153,7 +153,7 @@
return BadFontName;
if (!(pFont = CreateFontRec())) {
fprintf(stderr, "Error: Couldn't allocate pFont (%ld)\n",
- (ulong)sizeof(FontRec));
+ (unsigned long)sizeof(FontRec));
FontFileClose (file);
return AllocError;
}
Index: ./lib/font/bitmap/bitmaputil.c
===================================================================
RCS file: /cvs/xc/lib/font/bitmap/bitmaputil.c,v
retrieving revision 1.9
diff -u -r1.9 bitmaputil.c
--- ./lib/font/bitmap/bitmaputil.c 2002/09/19 13:21:59 1.9
+++ ./lib/font/bitmap/bitmaputil.c 2002/09/24 21:07:59
@@ -210,7 +210,7 @@
bitmapFont = (BitmapFontPtr) pFont->fontPrivate;
bitmapFont->ink_metrics = (xCharInfo *) xalloc(bitmapFont->num_chars *
sizeof(xCharInfo));
if (!bitmapFont->ink_metrics) {
- fprintf(stderr, "Error: Couldn't allocate ink_metrics (%d*%ld)\n",
bitmapFont->num_chars, (ulong)sizeof(xCharInfo));
+ fprintf(stderr, "Error: Couldn't allocate ink_metrics (%d*%ld)\n",
+bitmapFont->num_chars, (unsigned long)sizeof(xCharInfo));
return FALSE;
}
for (i = 0; i < bitmapFont->num_chars; i++)
Index: ./lib/font/bitmap/bitscale.c
===================================================================
RCS file: /cvs/xc/lib/font/bitmap/bitscale.c,v
retrieving revision 3.26
diff -u -r3.26 bitscale.c
--- ./lib/font/bitmap/bitscale.c 2002/09/19 13:21:59 3.26
+++ ./lib/font/bitmap/bitscale.c 2002/09/24 21:08:07
@@ -734,7 +734,7 @@
*pProps = fp;
if (!fp) {
fprintf(stderr, "Error: Couldn't allocate font properties (%ld*%d)\n",
- (ulong)sizeof(FontPropRec), nProps);
+ (unsigned long)sizeof(FontPropRec), nProps);
return 1;
}
isStringProp = (char *) xalloc (nProps);
@@ -921,7 +921,7 @@
bitmapFont = 0;
if (!(pf = CreateFontRec())) {
fprintf(stderr, "Error: Couldn't allocate FontRec (%ld)\n",
- (ulong)sizeof(FontRec));
+ (unsigned long)sizeof(FontRec));
goto bail;
}
pf->refcnt = 0;
@@ -989,7 +989,7 @@
bitmapFont = (BitmapFontPtr) xalloc(sizeof(BitmapFontRec));
if (!bitmapFont) {
fprintf(stderr, "Error: Couldn't allocate bitmapFont (%ld)\n",
- (ulong)sizeof(BitmapFontRec));
+ (unsigned long)sizeof(BitmapFontRec));
goto bail;
}
nchars = (lastRow - firstRow + 1) * (lastCol - firstCol + 1);
@@ -1010,7 +1010,7 @@
bitmapFont->metrics = (CharInfoPtr) xalloc(nchars * sizeof(CharInfoRec));
if (!bitmapFont->metrics) {
fprintf(stderr, "Error: Couldn't allocate metrics (%d*%ld)\n",
- nchars, (ulong)sizeof(CharInfoRec));
+ nchars, (unsigned long)sizeof(CharInfoRec));
goto bail;
}
bitmapFont->encoding =
@@ -1018,7 +1018,7 @@
sizeof(CharInfoPtr*));
if (!bitmapFont->encoding) {
fprintf(stderr, "Error: Couldn't allocate encoding (%d*%ld)\n",
- nchars, (ulong)sizeof(CharInfoPtr));
+ nchars, (unsigned long)sizeof(CharInfoPtr));
goto bail;
}
@@ -1337,7 +1337,7 @@
{
fprintf(stderr, "Warning: Couldn't allocate diffusion"
" workspace (%ld)\n",
- (newWidth + 2) * 2 * (ulong)sizeof(int));
+ (newWidth + 2) * 2 * (unsigned long)sizeof(int));
xfree(char_grayscale);
char_grayscale = (unsigned char *)0;
}
Index: ./lib/font/util/atom.c
===================================================================
RCS file: /cvs/xc/lib/font/util/atom.c,v
retrieving revision 1.9
diff -u -r1.9 atom.c
--- ./lib/font/util/atom.c 2002/09/19 13:22:00 1.9
+++ ./lib/font/util/atom.c 2002/09/24 21:08:07
@@ -84,7 +84,7 @@
if (!newHashTable) {
fprintf(stderr, "ResizeHashTable(): Error: Couldn't allocate"
" newHashTable (%ld)\n",
- newHashSize * (ulong)sizeof (AtomListPtr));
+ newHashSize * (unsigned long)sizeof (AtomListPtr));
return FALSE;
}
bzero ((char *) newHashTable, newHashSize * sizeof (AtomListPtr));
@@ -127,7 +127,7 @@
if (!reverseMap) {
fprintf(stderr, "ResizeReverseMap(): Error: Couldn't reallocate"
" reverseMap (%ld)\n",
- reverseMapSize * (ulong)sizeof(AtomListPtr));
+ reverseMapSize * (unsigned long)sizeof(AtomListPtr));
ret = FALSE;
}
return ret;
@@ -182,7 +182,7 @@
a = (AtomListPtr) xalloc (sizeof (AtomListRec) + len + 1);
if (a == NULL) {
fprintf(stderr, "MakeAtom(): Error: Couldn't allocate AtomListRec"
- " (%ld)\n", (ulong)sizeof (AtomListRec) + len + 1);
+ " (%ld)\n", (unsigned long)sizeof (AtomListRec) + len + 1);
return None;
}
a->name = (char *) (a + 1);
Index: ./programs/mkfontdir/mkfontdir.c
===================================================================
RCS file: /cvs/xc/programs/mkfontdir/mkfontdir.c,v
retrieving revision 3.19
diff -u -r3.19 mkfontdir.c
--- ./programs/mkfontdir/mkfontdir.c 2002/09/19 13:22:03 3.19
+++ ./programs/mkfontdir/mkfontdir.c 2002/09/24 21:08:10
@@ -484,8 +484,8 @@
return BadFontPath;
}
(void) sprintf(dir_format, "%%%lds %%%ld[^\n]\n",
- (ulong)sizeof(file_name) - 1,
- (ulong)sizeof(font_name) - 1);
+ (unsigned long)sizeof(file_name) - 1,
+ (unsigned long)sizeof(font_name) - 1);
while (fgets(dir_line, sizeof(dir_line), file) != NULL) {
count = sscanf(dir_line, dir_format, file_name, font_name);
if (count != 2) {
Index: ./programs/twm/list.c
===================================================================
RCS file: /cvs/xc/programs/twm/list.c,v
retrieving revision 1.7
diff -u -r1.7 list.c
--- ./programs/twm/list.c 2002/09/19 13:22:04 1.7
+++ ./programs/twm/list.c 2002/09/24 21:08:11
@@ -109,7 +109,7 @@
{
twmrc_error_prefix();
fprintf (stderr, "unable to allocate %ld bytes for name_list\n",
- (ulong)sizeof(name_list));
+ (unsigned long)sizeof(name_list));
Done(0);
}
Index: ./programs/twm/menus.c
===================================================================
RCS file: /cvs/xc/programs/twm/menus.c,v
retrieving revision 1.14
diff -u -r1.14 menus.c
--- ./programs/twm/menus.c 2002/09/19 13:22:04 1.14
+++ ./programs/twm/menus.c 2002/09/24 21:08:21
@@ -239,7 +239,7 @@
if (!tb) {
fprintf (stderr,
"%s: unable to allocate %ld bytes for title button\n",
- ProgramName, (ulong)sizeof(TitleButton));
+ ProgramName, (unsigned long)sizeof(TitleButton));
return 0;
}
Index: ./programs/twm/parse.c
===================================================================
RCS file: /cvs/xc/programs/twm/parse.c,v
retrieving revision 1.14
diff -u -r1.14 parse.c
--- ./programs/twm/parse.c 2002/09/19 13:22:04 1.14
+++ ./programs/twm/parse.c 2002/09/24 21:08:25
@@ -1145,7 +1145,7 @@
if (!sinfo) {
twmrc_error_prefix();
fprintf (stderr, "unable to allocate %ld bytes for squeeze info\n",
- (ulong)sizeof(SqueezeInfo));
+ (unsigned long)sizeof(SqueezeInfo));
return;
}
sinfo->justify = justify;
Index: ./programs/twm/util.c
===================================================================
RCS file: /cvs/xc/programs/twm/util.c,v
retrieving revision 1.12
diff -u -r1.12 util.c
--- ./programs/twm/util.c 2002/09/19 13:22:05 1.12
+++ ./programs/twm/util.c 2002/09/24 21:08:29
@@ -296,7 +296,7 @@
if (!newname) {
fprintf (stderr,
"%s: unable to allocate %ld bytes to expand filename %s/%s\n",
- ProgramName, HomeLen + (ulong)strlen(name) + 2,
+ ProgramName, HomeLen + (unsigned long)strlen(name) + 2,
Home, &name[1]);
} else {
(void) sprintf (newname, "%s/%s", Home, &name[1]);
@@ -449,7 +449,7 @@
sc = (StdCmap *) malloc (sizeof (StdCmap));
if (!sc) {
fprintf (stderr, "%s: unable to allocate %ld bytes for StdCmap\n",
- ProgramName, (ulong)sizeof (StdCmap));
+ ProgramName, (unsigned long)sizeof (StdCmap));
return;
}
}
Index: ./programs/xauth/process.c
===================================================================
RCS file: /cvs/xc/programs/xauth/process.c,v
retrieving revision 3.15
diff -u -r3.15 process.c
--- ./programs/xauth/process.c 2002/09/19 13:22:05 3.15
+++ ./programs/xauth/process.c 2002/09/24 21:08:34
@@ -1454,7 +1454,7 @@
if (!auth) {
prefix (inputfilename, lineno);
fprintf (stderr, "unable to allocate %ld bytes for Xauth structure\n",
- (ulong)sizeof (Xauth));
+ (unsigned long)sizeof (Xauth));
free (key);
return 1;
}
@@ -1491,7 +1491,7 @@
if (!list) {
prefix (inputfilename, lineno);
fprintf (stderr, "unable to allocate %ld bytes for auth list\n",
- (ulong)sizeof (AuthList));
+ (unsigned long)sizeof (AuthList));
free (auth);
free (key);
free (auth->name);
