[AC21.5] more GCC 4 signed-char warning elimination
18 years, 6 months
Stephen J. Turnbull
Stephen J. Turnbull
APPROVE COMMIT 21.5
This eliminates some more GCC 4 whining. However, there is a possibly
controversial aspect here: fontconfig uses "const" all over the place,
and I needed to match it. Please report any problems, I will fix
immediately or revert. Unfortunately I'm not enough of a language
lawyer to fix const issues without bug reports, so I figure I may as
well commit. :-/
Index: src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.978
diff -u -r1.978 ChangeLog
--- src/ChangeLog 21 Jun 2006 17:30:33 -0000 1.978
+++ src/ChangeLog 23 Jun 2006 14:14:49 -0000
＠＠ -0,0 +1,13 ＠＠
+2006-06-23 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * font-mgr.c (extract_fcapi_string):
+ (fc_intern):
+ (Ffc_name_parse):
+ (Ffc_name_unparse):
+ (Ffc_pattern_add):
+ (Ffc_pattern_del):
+ (Ffc_pattern_get):
+ (string_list_to_fcobjectset):
+ fc_intern and extract_fcapi_string should return
+ [const] Extbyte *. Make it so, update callers.
+
Index: src/font-mgr.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/font-mgr.c,v
retrieving revision 1.3
diff -u -r1.3 font-mgr.c
--- src/font-mgr.c 1 May 2006 18:17:23 -0000 1.3
+++ src/font-mgr.c 23 Jun 2006 14:14:49 -0000
＠＠ -120,7 +120,7 ＠＠
is a Lisp string.
*/
#define extract_fcapi_string(str) \
- ((FcChar8 *) NEW_LISP_STRING_TO_EXTERNAL ((str), Qfc_font_name_encoding))
+ (NEW_LISP_STRING_TO_EXTERNAL ((str), Qfc_font_name_encoding))
/* #### This homebrew lashup should be replaced with FcConstants.
＠＠ -158,20 +158,20 ＠＠
/* #### Maybe fc_intern should be exposed to LISP? The idea is that
fc-pattern-add could warn or error if the property isn't interned. */
-static FcChar8 *
+static const Extbyte *
fc_intern (Lisp_Object property)
{
const void *dummy;
- FcChar8 *prop = extract_fcapi_string (property);
+ const Extbyte *prop = extract_fcapi_string (property);
const void *val = gethash (prop, fc_property_name_hash_table, &dummy);
/* extract_fcapi_string returns something alloca'd
so we can just drop the old value of prop on the floor */
if (val)
- prop = (FcChar8 *) val;
+ prop = (const Extbyte *) val;
else
{
- prop = FcStrCopy (prop);
+ prop = (const Extbyte *) FcStrCopy ((FcChar8 *) prop);
puthash (prop, NULL, fc_property_name_hash_table);
}
return prop;
＠＠ -207,7 +207,7 ＠＠
CHECK_STRING(name); /* #### MEMORY LEAK!! maybe not ... */
- fcpat->fcpatPtr = FcNameParse (extract_fcapi_string (name));
+ fcpat->fcpatPtr = FcNameParse ((FcChar8 *) extract_fcapi_string (name));
return wrap_fcpattern(fcpat);
}
＠＠ -220,10 +220,10 ＠＠
{
CHECK_FCPATTERN(pattern);
{
- FcChar8 *temp = FcNameUnparse(XFCPATTERN_PTR(pattern));
- Lisp_Object res = build_ext_string (temp, Qfc_font_name_encoding);
- free (temp);
- return res;
+ Extbyte *temp = (Extbyte *) FcNameUnparse(XFCPATTERN_PTR(pattern));
+ Lisp_Object res = build_ext_string (temp, Qfc_font_name_encoding);
+ free (temp);
+ return res;
}
}
＠＠ -250,7 +250,7 ＠＠
(pattern, property, value))
{
Bool res = 0;
- Extbyte *obj;
+ const Extbyte *obj;
FcPattern *fcpat;
CHECK_FCPATTERN(pattern);
＠＠ -291,8 +291,7 ＠＠
CHECK_FCPATTERN(pattern);
CHECK_STRING(property);
- res = FcPatternDel(XFCPATTERN_PTR(pattern),
- extract_fcapi_string (property));
+ res = FcPatternDel(XFCPATTERN_PTR(pattern), extract_fcapi_string (property));
return res ? Qt : Qnil;
}
＠＠ -375,7 +374,7 ＠＠
Xft v.2: encoding, charwidth, charheight, core, and render. */
(pattern, property, id, type))
{
- FcChar8 *fc_property; /* UExtbyte * */
+ Extbyte *fc_property;
FcResult fc_result;
FcValue fc_value;
＠＠ -390,7 +389,7 ＠＠
#endif
if (STRINGP (property))
{
- fc_property = (FcChar8 *) extract_fcapi_string (property);
+ fc_property = extract_fcapi_string (property);
}
else
{
＠＠ -427,7 +426,8 ＠＠
case FcTypeString:
return ((!NILP (type) && !EQ (type, Qstring))
? Qfc_result_type_mismatch
- : build_ext_string (fc_value.u.s, Qfc_font_name_encoding));
+ : build_ext_string ((Extbyte *) fc_value.u.s,
+ Qfc_font_name_encoding));
case FcTypeBool:
return ((!NILP (type) && !EQ (type, Qboolean))
? Qfc_result_type_mismatch : fc_value.u.b ? Qt : Qnil);
＠＠ -700,7 +700,7 ＠＠
{
EXTERNAL_LIST_LOOP_2 (elt, list)
{
- FcChar8 *s;
+ const Extbyte *s;
CHECK_STRING (elt);
s = fc_intern (elt);
--
Graduate School of Systems and Information Engineering University of Tsukuba
http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Economics of Information Communication and Computation Systems
Experimental Economics, Microeconomic Theory, Game Theory
- 1 participants
- 0 comments
GCC 4 signed-char warnings
18 years, 6 months
Stephen J. Turnbull
Stephen J. Turnbull
APPROVE COMMIT 21.5
Fix some warnings due to Extbyte/FcChar8 confusion. Should be
uncontroversial.
Index: src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.978
diff -u -r1.978 ChangeLog
--- src/ChangeLog 21 Jun 2006 17:30:33 -0000 1.978
+++ src/ChangeLog 23 Jun 2006 14:13:22 -0000
＠＠ -0,0 +1,8 ＠＠
+2006-05-26 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * objects-x.c (x_initialize_font_instance):
+ (x_font_instance_truename):
+ (charset_table):
+ (x_find_charset_font):
+ Pander to GCC4 signed character paranoia.
+
Index: src/objects-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
retrieving revision 1.42
diff -u -r1.42 objects-x.c
--- src/objects-x.c 30 May 2006 06:21:31 -0000 1.42
+++ src/objects-x.c 23 Jun 2006 14:13:22 -0000
＠＠ -253,7 +253,7 ＠＠
#define PRINT_XFT_PATTERN(level,format,pattern) \
do { \
DECLARE_EISTRING (eistrpxft_name); \
- FcChar8 *name = FcNameUnparse (pattern); \
+ Extbyte *name = (Extbyte *) FcNameUnparse (pattern); \
\
eicpy_ext(eistrpxft_name, name, Qfc_font_name_encoding); \
DEBUG_XFT1 (level, format, eidata(eistrpxft_name)); \
＠＠ -267,7 +267,7 ＠＠
#define CHECKING_LANG(level,font,lang) \
do { \
DECLARE_EISTRING (eistrcl_name); \
- eicpy_ext(eistrcl_name, font, Qfc_font_name_encoding); \
+ eicpy_ext(eistrcl_name, (Extbyte *) font, Qfc_font_name_encoding); \
DEBUG_XFT2 (level, "checking if %s handles %s\n", \
eidata(eistrcl_name), lang); \
} while (0)
＠＠ -347,7 +347,7 ＠＠
cell size for estimating window dimensions. The test_string8
is an ASCII string whose characters should approximate the
distribution of widths expected in real text. */
- static const char test_string8[] = "Mmneei";
+ static const FcChar8 test_string8[] = "Mmneei";
static const int len = sizeof (test_string8) - 1;
XGlyphInfo glyphinfo;
＠＠ -814,7 +814,7 ＠＠
if (res)
{
FONT_INSTANCE_TRUENAME (f) =
- build_ext_string (res, Qfc_font_name_encoding);
+ build_ext_string ((Extbyte *) res, Qfc_font_name_encoding);
free (res);
return FONT_INSTANCE_TRUENAME (f);
}
＠＠ -1120,7 +1120,8 ＠＠
Lisp_Object *charset;
/* This is a debug facility, require ASCII. */
Extbyte *language; /* ASCII, please */
- FcChar8 *rfc3066; /* ASCII, please */
+ /* Technically this is FcChar8, but fsckin' GCC 4 bitches. */
+ Extbyte *rfc3066; /* ASCII, please */
};
static struct charset_reporter charset_table[] =
＠＠ -1218,7 +1219,7 ＠＠
FcPattern *fontxft; /* long-lived, freed at end of this block */
FcResult fcresult;
FcConfig *fcc;
- FcChar8 *lang = "en"; /* #### fix this bogus hack! */
+ FcChar8 *lang = (FcChar8 *) "en"; /* #### fix this bogus hack! */
FcCharSet *fccs = NULL;
DECLARE_EISTRING (eistr_shortname); /* user-friendly nickname */
DECLARE_EISTRING (eistr_longname); /* omit FC_LANG and FC_CHARSET */
＠＠ -1230,7 +1231,7 ＠＠
/* parse the name, do the substitutions, and match the font */
{
- FcPattern *p = FcNameParse (patternext);
+ FcPattern *p = FcNameParse ((FcChar8 *) patternext);
PRINT_XFT_PATTERN (3, "FcNameParse'ed name is %s\n", p);
/* #### Next two return FcBool, but what does the return mean? */
/* The order is correct according the fontconfig docs. */
＠＠ -1257,7 +1258,7 ＠＠
/* full name, including language coverage and repertoire */
name = FcNameUnparse (p);
- eicpy_ext (eistr_fullname, name, Qfc_font_name_encoding);
+ eicpy_ext (eistr_fullname, (Extbyte *) name, Qfc_font_name_encoding);
free (name);
/* long name, omitting coverage and repertoire, plus a number
＠＠ -1274,7 +1275,7 ＠＠
FcPatternDel (p, FC_SCALE);
FcPatternDel (p, FC_FONTVERSION);
name = FcNameUnparse (p);
- eicpy_ext (eistr_longname, name, Qfc_font_name_encoding);
+ eicpy_ext (eistr_longname, (Extbyte *) name, Qfc_font_name_encoding);
free (name);
/* nickname, just family and size, but
＠＠ -1288,7 +1289,7 ＠＠
FcPatternDel (p, FC_SCALABLE);
FcPatternDel (p, FC_DPI);
name = FcNameUnparse (p);
- eicpy_ext (eistr_shortname, name, Qfc_font_name_encoding);
+ eicpy_ext (eistr_shortname, (Extbyte *) name, Qfc_font_name_encoding);
free (name);
FcPatternDestroy (p);
＠＠ -1316,14 +1317,15 ＠＠
{
DECLARE_DEBUG_FONTNAME (name);
CHECKING_LANG (0, eidata(name), cr->language);
- lang = cr->rfc3066;
+ lang = (FcChar8 *) cr->rfc3066;
}
else if (cr->charset)
{
/* what the hey, build 'em on the fly */
/* #### in the case of error this could return NULL! */
fccs = mule_to_fc_charset (charset);
- lang = XSTRING_DATA (XSYMBOL (XCHARSET_NAME (charset))-> name);
+ lang = (FcChar8 *) XSTRING_DATA (XSYMBOL
+ (XCHARSET_NAME (charset))-> name);
}
else
{
＠＠ -1331,13 +1333,13 ＠＠
warn_when_safe_lispobj (intern ("xft"), intern ("alert"),
list2 (build_string ("unchecked charset"),
charset));
+ /* default to "en"
+ #### THIS IS WRONG, WRONG, WRONG!!
+ It is why we never fall through to XLFD-checking. */
}
- /* default to "en"
- #### THIS IS WRONG, WRONG, WRONG!!
- It is why we never fall through to XLFD-checking. */
- }
- ASSERT_ASCTEXT_ASCII(lang);
+ ASSERT_ASCTEXT_ASCII((Extbyte *) lang);
+ }
if (fccs)
{
--
Graduate School of Systems and Information Engineering University of Tsukuba
http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Economics of Information Communication and Computation Systems
Experimental Economics, Microeconomic Theory, Game Theory
- 1 participants
- 0 comments
[PATCH] fix for toolbar-kill-item-pos
18 years, 6 months
Jeff Miller
Jeff Miller
Someone at work asked how to remove a toolbar button and I suggested
using toolbar-kill-item-pos only to find it didn't work. It
complained about setting a nil specifier and when it did work after
telling it to use default-toolbar, only the portion after the removed
button showed up.
Turns out "toolbar" is used twice in the function but only tested for
nil once. Also, someone assumed that setcdr returns the newly
assembled spec list, it doesn't. Just the new cdr.
Jeff
ChangeLog addition:
2006-06-22 Jeff Miller <jmiller(a)cablespeed.com>
* toolbar-utils.el (toolbar-kill-item-pos): set toolbar to default-toolbar if not
passed as an argument.
Fix wrong usage of setcdr when setting specifier.
toolbar source patch:
Diff command: cvs -q diff -u
Files affected: toolbar-utils.el
Index: toolbar-utils.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/edit-utils/toolbar-utils.el,v
retrieving revision 1.2
diff -u -u -r1.2 toolbar-utils.el
--- toolbar-utils.el 2002/12/12 03:28:33 1.2
+++ toolbar-utils.el 2006/06/23 02:34:35
＠＠ -383,14 +383,14 ＠＠
See also `toolbar-find-button-by-icon', `toolbar-find-button-by-command',
and `toolbar-find-button-by-help-string'."
(setq locale (or locale 'global))
- (let ((spec (cdadar (specifier-spec-list (or toolbar default-toolbar)
- locale))))
+ (setq toolbar (or toolbar default-toolbar))
+ (let ((spec (cdadar (specifier-spec-list toolbar locale))))
(setq button-palette (cons (nth pos spec) button-palette))
- (set-specifier toolbar (if (eq pos 0)
- (cdr spec)
- (setcdr (nthcdr (1- pos) spec)
- (nthcdr (1+ pos) spec)))
- locale)))
+ (if (eq pos 0)
+ (setq spec (cdr spec))
+ (setcdr (nthcdr (1- pos) spec)
+ (nthcdr (1+ pos) spec)))
+ (set-specifier toolbar spec locale)))
;; locating buttons by their content, returning a position
- 1 participants
- 0 comments
[PATCH 21.5] Static checker fun
18 years, 6 months
Jerry James
Jerry James
PATCH 21.5
I get to play with static checkers this summer. Here's some stuff that
some code analysis tools I'm working with found in our code base. There
were tons of false positives for various reasons, too. Locating these
took some digging through the voluminous output. One thing I hope to
accomplish is finding ways of making the checker shut up about good code
that it isn't smart enough to understand. Here are some brief
descriptions about what is going on and why I think this patch is
correct. If there is anything controversial in here, I'll split it out
as a separate patch.
lwlib-Xlw.c: The initializer for 'val' dereferences 'instance'.
Following that, we check whether 'val' is NULL and return without doing
anything if so. That's backwards.
xlwmenu.c: In the do-while loop starting on line 3662, if !parent, then
root and waste do not get initialized (via a call to XQueryTree), and so
comparing parent to root in the loop condition is bad, as is checking
whether waste is non-NULL in order to XFree it.
dgif_lib.c: The code sets 'Private' by dereferencing 'GifFile', then
checks whether 'GifFile' is NULL. That's backwards. Also, if we fail
to allocate memory for 'Object->Colors', then we return without
deallocating 'Object'.
fileio.c: Unfortunately, you cannot see line 2854 in the patch. On that
line, fd is set to -1. Therefore, it can never be the case that fd >=
0.
input-method-xlib.c: The function starts by dereferencing f, then xic,
in variable initializers, then checks whether either of the two
variables is NULL. Backwards again!
md5.c: If Lstream_read encounters an error, it returns -1. This code is
only checking for a zero return value.
nas.c: In every place where the Err() macro is used, the local variable
wi contains the only pointer to allocated storage.
scrollbar-x.c: Both SCROLLBAR_X_NAME and SCROLLBAR_X_WIDGET dereference
'instance->scrollbar_data', but then we check whether that is NULL at
the very end of the function.
text.c: This is actually more work than necessary. We only need to move
the very first assertion, in order to compare ei against NULL. I just
moved the other two because they neither affect nor are affected by the
intervening block of code, and you might as well fail early if you are
going to fail. Actually, this still isn't strong enough. We should
probably add:
assert ((off < 0 || len < 0) == (ei != 0));
but I don't understand this code and would like the opinion of someone
who does.
vdb-posix.c: ABORT() can return (under unusual circumstances,
admittedly, but it can), but this code assumes it cannot. Initialize
signal_name to the empty string to guard against that. Actually, we
probably ought to audit all uses of ABORT() and make sure they can
handle a return.
window.c: CURCHARSIZE expands to a call to either window_char_width or
window_char_height, depending on the value of widthflag. Since the code
visible in this patch is inside of a 'if (widthflag) { ... }' block,
there is really no point in making that comparison.
lwlib/ChangeLog addition:
2006-06-16 Jerry James <james(a)xemacs.org>
* lwlib-Xlw.c (xlw_scrollbar_callback): Do not dereference
instance before checking whether it is NULL.
* xlwmenu.c (xlw_map_menu): Prevent uninitialized access to root
and waste.
src/ChangeLog addition:
2006-06-16 Jerry James <james(a)xemacs.org>
* dgif_lib.c (DGifCloseFile): Do not dereference GifFile before
checking if it is NULL. Also fix a memory leak.
* fileio.c (Finsert_file_contents_internal): Remove dead code.
* input-method-xlib.c (XIM_SetGeometry): Do not dereference f or
xic before checking if they are NULL.
* md5.c (Fmd5): Check whether Lstream_read encountered an error.
* nas.c (Err): Fix a memory leak.
* scrollbar-x.c (x_free_scrollbar_instance): Do not dereference
instance->scrollbar_data before checking if it is NULL.
* text.c (eicmp_1): Move assertions to before the point where they
must be true for correctness.
* vdb-posix.c (vdb_fault_handler): Guard against a return from
ABORT().
* window.c (change_window_height): Skip always true comparison in
the expansion of CURCHARSIZE.
xemacs-21.5 source patch:
Diff command: cvs -q diff -uN
Files affected: src/window.c src/vdb-posix.c src/text.c src/scrollbar-x.c src/nas.c src/md5.c src/input-method-xlib.c src/fileio.c src/dgif_lib.c lwlib/xlwmenu.c lwlib/lwlib-Xlw.c
Index: lwlib/lwlib-Xlw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/lwlib-Xlw.c,v
retrieving revision 1.15
diff -d -u -r1.15 lwlib-Xlw.c
--- lwlib/lwlib-Xlw.c 2005/11/26 11:45:59 1.15
+++ lwlib/lwlib-Xlw.c 2006/06/16 21:06:55
＠＠ -158,13 +158,13 ＠＠
XlwScrollBarCallbackStruct *data =
(XlwScrollBarCallbackStruct *) call_data;
scroll_event event_data;
- scrollbar_values *val =
- (scrollbar_values *) instance->info->val->scrollbar_data;
+ scrollbar_values *val;
double percent;
if (!instance || widget->core.being_destroyed)
return;
+ val = (scrollbar_values *) instance->info->val->scrollbar_data;
id = instance->info->id;
percent = (double) (data->value - 1) / (double) (INT_MAX - 1);
Index: lwlib/xlwmenu.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwmenu.c,v
retrieving revision 1.41
diff -d -u -r1.41 xlwmenu.c
--- lwlib/xlwmenu.c 2006/05/12 19:25:29 1.41
+++ lwlib/xlwmenu.c 2006/06/16 21:06:55
＠＠ -3630,8 +3630,8 ＠＠
if (!mw->menu.pointer_grabbed)
{
XWindowAttributes ret;
- Window parent,root;
- Window *waste;
+ Window parent,root = 0UL;
+ Window *waste = NULL;
unsigned int num_waste;
lw_menu_active = True;
Index: src/dgif_lib.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dgif_lib.c,v
retrieving revision 1.13
diff -d -u -r1.13 dgif_lib.c
--- src/dgif_lib.c 2004/05/06 12:12:13 1.13
+++ src/dgif_lib.c 2006/06/16 21:06:55
＠＠ -366,10 +366,11 ＠＠
******************************************************************************/
int DGifCloseFile(GifFileType *GifFile)
{
- GifFilePrivateType *Private = (GifFilePrivateType *)GifFile->Private;
+ GifFilePrivateType *Private;
if (GifFile == NULL) return -1;
+ Private = (GifFilePrivateType *)GifFile->Private;
if (!IS_READABLE(Private))
{
/* This file was NOT open for reading: */
＠＠ -929,8 +930,10 ＠＠
return((ColorMapObject *)NULL);
Object->Colors = (GifColorType *)calloc(ColorCount, sizeof(GifColorType));
- if (Object->Colors == (GifColorType *)NULL)
+ if (Object->Colors == (GifColorType *)NULL) {
+ free(Object);
return((ColorMapObject *)NULL);
+ }
Object->ColorCount = ColorCount;
Object->BitsPerPixel = BitSize(ColorCount);
Index: src/fileio.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/fileio.c,v
retrieving revision 1.104
diff -d -u -r1.104 fileio.c
--- src/fileio.c 2005/01/28 02:36:24 1.104
+++ src/fileio.c 2006/06/16 21:06:55
＠＠ -2855,7 +2855,6 ＠＠
if (qxe_stat (XSTRING_DATA (filename), &st) < 0)
{
- if (fd >= 0) retry_close (fd);
badopen:
if (NILP (visit))
report_file_error ("Opening input file", filename);
Index: src/input-method-xlib.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/input-method-xlib.c,v
retrieving revision 1.21
diff -d -u -r1.21 input-method-xlib.c
--- src/input-method-xlib.c 2005/01/24 23:33:59 1.21
+++ src/input-method-xlib.c 2006/06/16 21:06:55
＠＠ -384,13 +384,18 ＠＠
void
XIM_SetGeometry (struct frame *f)
{
- XIC xic = FRAME_X_XIC (f);
- XIMStyle style = FRAME_X_XIC_STYLE (f);
+ XIC xic;
+ XIMStyle style;
XRectangle area;
- if (!xic || !f)
+ if (!f)
return;
+ xic = FRAME_X_XIC (f);
+ if (!xic)
+ return;
+
+ style = FRAME_X_XIC_STYLE (f);
if (style & XIMStatusArea)
{
/* Place Status Area in bottom right corner */
Index: src/md5.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/md5.c,v
retrieving revision 1.15
diff -d -u -r1.15 md5.c
--- src/md5.c 2002/06/05 09:56:26 1.15
+++ src/md5.c 2006/06/16 21:06:55
＠＠ -556,7 +556,7 ＠＠
Ibyte tempbuf[1024]; /* some random amount */
Bytecount size_in_bytes =
Lstream_read (XLSTREAM (instream), tempbuf, sizeof (tempbuf));
- if (!size_in_bytes)
+ if (size_in_bytes <= 0)
break;
/* Process the bytes. */
Index: src/nas.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/nas.c,v
retrieving revision 1.18
diff -d -u -r1.18 nas.c
--- src/nas.c 2004/11/04 23:06:43 1.18
+++ src/nas.c 2006/06/16 21:06:55
＠＠ -728,7 +728,7 ＠＠
/* Stuff taken from wave.c from NAS. Just like snd files, NAS can't
read wave data from memory, so these functions do that for us. */
-#define Err() { return NULL; }
+#define Err() { free(wi); return NULL; }
#define readFourcc(_f) dread(_f, sizeof(RIFF_FOURCC), 1)
#define cmpID(_x, _y) \
strncmp((CBinbyte *) (_x), (CBinbyte *) (_y), sizeof(RIFF_FOURCC))
Index: src/scrollbar-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-x.c,v
retrieving revision 1.31
diff -d -u -r1.31 scrollbar-x.c
--- src/scrollbar-x.c 2005/10/25 08:32:49 1.31
+++ src/scrollbar-x.c 2006/06/16 21:06:55
＠＠ -72,19 +72,21 ＠＠
static void
x_free_scrollbar_instance (struct scrollbar_instance *instance)
{
- if (SCROLLBAR_X_NAME (instance))
- xfree (SCROLLBAR_X_NAME (instance), char *);
-
- if (SCROLLBAR_X_WIDGET (instance))
+ if (instance->scrollbar_data)
{
- if (XtIsManaged (SCROLLBAR_X_WIDGET (instance)))
- XtUnmanageChild (SCROLLBAR_X_WIDGET (instance));
+ if (SCROLLBAR_X_NAME (instance))
+ xfree (SCROLLBAR_X_NAME (instance), char *);
- lw_destroy_all_widgets (SCROLLBAR_X_ID (instance));
- }
+ if (SCROLLBAR_X_WIDGET (instance))
+ {
+ if (XtIsManaged (SCROLLBAR_X_WIDGET (instance)))
+ XtUnmanageChild (SCROLLBAR_X_WIDGET (instance));
- if (instance->scrollbar_data)
- xfree (instance->scrollbar_data, void *);
+ lw_destroy_all_widgets (SCROLLBAR_X_ID (instance));
+ }
+
+ xfree (instance->scrollbar_data, void *);
+ }
}
/* A device method. */
Index: src/text.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/text.c,v
retrieving revision 1.26
diff -d -u -r1.26 text.c
--- src/text.c 2005/09/27 05:29:44 1.26
+++ src/text.c 2006/06/16 21:06:56
＠＠ -2138,7 +2138,11 ＠＠
Bytecount len, Charcount charlen, const Ibyte *data,
const Eistring *ei2, int is_ascii, int fold_case)
{
+ assert ((data == 0) != (ei == 0));
+ assert ((is_ascii != 0) == (data != 0));
+ assert (fold_case >= 0 && fold_case <= 2);
assert ((off < 0) != (charoff < 0));
+
if (off < 0)
{
off = charcount_to_bytecount (ei->data_, charoff);
＠＠ -2152,9 +2156,6 ＠＠
assert (off >= 0 && off <= ei->bytelen_);
assert (len >= 0 && off + len <= ei->bytelen_);
- assert ((data == 0) != (ei == 0));
- assert ((is_ascii != 0) == (data != 0));
- assert (fold_case >= 0 && fold_case <= 2);
{
Bytecount dstlen;
Index: src/vdb-posix.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/vdb-posix.c,v
retrieving revision 1.2
diff -d -u -r1.2 vdb-posix.c
--- src/vdb-posix.c 2006/03/27 15:20:31 1.2
+++ src/vdb-posix.c 2006/06/16 21:06:56
＠＠ -73,7 +73,7 ＠＠
}
else /* default sigsegv handler */
{
- char *signal_name;
+ char *signal_name = "";
if (signum == SIGSEGV)
signal_name = "SIGSEGV";
else if (signum == SIGBUS)
Index: src/window.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/window.c,v
retrieving revision 1.90
diff -d -u -r1.90 window.c
--- src/window.c 2005/11/25 01:42:08 1.90
+++ src/window.c 2006/06/16 21:06:56
＠＠ -4380,7 +4380,7 ＠＠
{
int new_pixsize;
sizep = &CURSIZE (w);
- dim = CURCHARSIZE (w);
+ dim = window_char_width (w, 0);
new_pixsize = inpixels?(*sizep + delta):(dim+delta);
set_window_pixsize (window, new_pixsize, 0, 0);
return;
--
Jerry James, Assistant Professor james(a)xemacs.org
Computer Science Department http://www.cs.usu.edu/~jerry/
Utah State University
- 3 participants
- 8 comments
[PATCH 21.5] More fun with static checkers
18 years, 6 months
Jerry James
Jerry James
PATCH 21.5
Here are some more changes from slogging through piles of reports from
various static checkers. My, our code generates a lot of false
positives! Here are the detailed explanations for each of these
changes.
device-x.c: At the top of the function we assert(d != NULL), and none of
the intervening code changes the value of d. Therefore, we don't need
to check d here; this comparison is always true. (Indeed, if it were
not, then the next line, which dereferences d, would be wrong.)
dialog-x.c: This one is easy. FRAME_X_EXTERNAL_WINDOW_P dereferences
its argument, so the condition is clearly reversed.
emacs.c: This code is in an else block attached to an if (restart), so
therefore restart == 0 always.
extents.c: Since extent_list_delete_all dereferences its argument, call
it only inside the block where we know its argument is non-NULL.
glyphs-widget.c: The early code in this function is careful to check
whether width and height are non-NULL before dereferencing them. This
part of the code ought to do the same, then.
window.c: The macro CURSIZE checks the value of widthflag. We know the
value of widthflag; it is nonzero. Therefore, it is okay to expand
CURSIZE and pull out the part that is evaluated when widthflag is
nonzero.
src/ChangeLog addition:
2006-06-19 Jerry James <james(a)xemacs.org>
* device-x.c (x_IO_error_handler): d is always non-NULL here.
* dialog-x.c (dbox_selection_callback): Ensure f is non-NULL, then
dereference it, not the other way around.
* emacs.c (main_1): restart is always 0 here.
* extents.c (detach_all_extents): Call extent_list_delete_all with
a non-NULL parameter only.
* glyphs-widget.c (widget_query_geometry): Guard against possibly
NULL width and height.
* window.c (change_window_height): CURSIZE performs an always-true
comparison; expand CURSIZE and drop the unreachable code.
xemacs-21.5 source patch:
Diff command: cvs -q diff -uN
Files affected: src/window.c src/glyphs-widget.c src/extents.c src/emacs.c src/dialog-x.c src/device-x.c
Index: src/device-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-x.c,v
retrieving revision 1.66
diff -d -u -r1.66 device-x.c
--- src/device-x.c 2005/11/25 01:41:59 1.66
+++ src/device-x.c 2006/06/19 23:11:01
＠＠ -1214,8 +1214,7 ＠＠
/* According to X specs, we should not return from this function, or
Xlib might just decide to exit(). So we mark the offending
console for deletion and throw to top level. */
- if (d)
- enqueue_magic_eval_event (io_error_delete_device, dev);
+ enqueue_magic_eval_event (io_error_delete_device, dev);
DEVICE_X_BEING_DELETED (d) = 1;
Fthrow (Qtop_level, Qnil);
Index: src/dialog-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dialog-x.c,v
retrieving revision 1.15
diff -d -u -r1.15 dialog-x.c
--- src/dialog-x.c 2004/09/20 19:19:38 1.15
+++ src/dialog-x.c 2006/06/19 23:11:01
＠＠ -104,7 +104,7 ＠＠
ourselves. */
#ifdef EXTERNAL_WIDGET
/* #### Not sure if this special case is necessary. */
- if (!FRAME_X_EXTERNAL_WINDOW_P (f) && f)
+ if (f && !FRAME_X_EXTERNAL_WINDOW_P (f))
#else
if (f)
#endif
Index: src/emacs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v
retrieving revision 1.167
diff -d -u -r1.167 emacs.c
--- src/emacs.c 2006/05/06 17:55:59 1.167
+++ src/emacs.c 2006/06/19 23:11:02
＠＠ -1395,7 +1395,7 ＠＠
inhibit_site_modules = inhibit_site_modules_save;
if (initialized)
- run_temacs_argc = restart ? -2 : -1;
+ run_temacs_argc = -1;
else
purify_flag = 1;
}
Index: src/extents.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/extents.c,v
retrieving revision 1.65
diff -d -u -r1.65 extents.c
--- src/extents.c 2006/02/27 16:29:25 1.65
+++ src/extents.c 2006/06/19 23:11:02
＠＠ -1455,11 +1455,11 ＠＠
set_extent_start (e, -1);
set_extent_end (e, -1);
}
- }
- /* But we need to clear all the lists containing extents or
- havoc will result. */
- extent_list_delete_all (data->extents);
+ /* But we need to clear all the lists containing extents or
+ havoc will result. */
+ extent_list_delete_all (data->extents);
+ }
soe_invalidate (object);
}
}
Index: src/glyphs-widget.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-widget.c,v
retrieving revision 1.18
diff -d -u -r1.18 glyphs-widget.c
--- src/glyphs-widget.c 2005/11/26 11:46:08 1.18
+++ src/glyphs-widget.c 2006/06/19 23:11:02
＠＠ -569,21 +569,21 ＠＠
IMAGE_INSTANCE_WIDGET_FACE (ii),
&w, &h, domain);
/* Adjust the size for borders. */
- if (IMAGE_INSTANCE_SUBWINDOW_H_RESIZEP (ii))
+ if (width && IMAGE_INSTANCE_SUBWINDOW_H_RESIZEP (ii))
*width = w + 2 * widget_instance_border_width (ii);
- if (IMAGE_INSTANCE_SUBWINDOW_V_RESIZEP (ii))
+ if (height && IMAGE_INSTANCE_SUBWINDOW_V_RESIZEP (ii))
*height = h + 2 * widget_instance_border_width (ii);
}
}
/* Finish off with dynamic sizing. */
- if (!NILP (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii)))
+ if (width && !NILP (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii)))
{
dynamic_width =
eval_within_redisplay (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii));
if (INTP (dynamic_width))
*width = XINT (dynamic_width);
}
- if (!NILP (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii)))
+ if (height && !NILP (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii)))
{
dynamic_height =
eval_within_redisplay (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii));
Index: src/window.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/window.c,v
retrieving revision 1.91
diff -d -u -r1.91 window.c
--- src/window.c 2006/06/19 18:19:38 1.91
+++ src/window.c 2006/06/19 23:11:03
＠＠ -4379,7 +4379,7 ＠＠
if (widthflag)
{
int new_pixsize;
- sizep = &CURSIZE (w);
+ sizep = &WINDOW_WIDTH (w);
dim = window_char_width (w, 0);
new_pixsize = inpixels?(*sizep + delta):(dim+delta);
set_window_pixsize (window, new_pixsize, 0, 0);
--
Jerry James, Assistant Professor james(a)xemacs.org
Computer Science Department http://www.cs.usu.edu/~jerry/
Utah State University
- 2 participants
- 3 comments
[AC 21.5] Sentinel warnings
18 years, 6 months
Jerry James
Jerry James
APPROVE COMMIT 21.5
Both GCC 4.0.3 and 4.1.1 issue warnings on this code due to a missing
sentinel. The sentinel (the terminating NULL argument) is not really
missing, of course, it has just been cast to an XtArgVal. This patch
removes the casts (which are unnecessary anyway with an ANSI C compiler,
which we require) so that GCC will stop moaning.
src/ChangeLog addition:
2006-06-19 Jerry James <james(a)xemacs.org>
* frame-x.c (x_set_frame_properties): Remove casts to silence GCC
warnings about a missing sentinel.
xemacs-21.5 source patch:
Diff command: cvs -q diff -uN
Files affected: src/frame-x.c
Index: src/frame-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-x.c,v
retrieving revision 1.74
diff -d -u -r1.74 frame-x.c
--- src/frame-x.c 2006/05/22 22:07:07 1.74
+++ src/frame-x.c 2006/06/19 18:43:44
＠＠ -783,12 +783,12 ＠＠
/* !!#### Verify this + 1 and document
as zero-termination */
XtRString, extval, extvallen + 1,
- (XtArgVal) NULL);
+ NULL);
}
else
XtVaSetValues (w, XtVaTypedArg, extprop, XtRInt,
XINT (val), sizeof (int),
- (XtArgVal) NULL);
+ NULL);
}
else if (SYMBOLP (prop))
{
＠＠ -887,7 +887,7 ＠＠
/* !!#### Verify this + 1 and document
as zero-termination */
XtRString, extval, extvallen + 1,
- (XtArgVal) NULL);
+ NULL);
}
#ifdef HAVE_SCROLLBARS
--
Jerry James, Assistant Professor james(a)xemacs.org
Computer Science Department http://www.cs.usu.edu/~jerry/
Utah State University
- 1 participants
- 0 comments
[PATCH 21.5] Stats buffers are too large
18 years, 6 months
Jerry James
Jerry James
PATCH 21.5
Usually we worry more about buffers that are too small, I know.
However, there is no point in allocating and then iterating over memory
that will never be used. In lrecord.h is this declaration:
extern MODULE_API const struct lrecord_implementation *
lrecord_implementations_table[lrecord_type_last_built_in_type + MODULE_DEFINABLE_TYPE_COUNT];
which means that countof (lrecord_implementations_table) ==
lrecord_type_last_built_in_type + MODULE_DEFINABLE_TYPE_COUNT, so there
is no point in adding MODULE_DEFINABLE_TYPE_COUNT on yet again in the
expressions in alloc.c. This patch removes the extra
MODULE_DEFINABLE_TYPE_COUNT.
Note that this still leaves the stats arrays with extra room. Both
lrecord_stats and lcrecord_stats have slots for every possible type,
even though a given type will appear in only one of the two.
src/ChangeLog addition:
2006-06-16 Jerry James <james(a)xemacs.org>
* alloc.c: Don't add MODULE_DEFINABLE_TYPE_COUNT to
countof (lrecord_implementations_table); the latter is already big
enough.
xemacs-21.5 source patch:
Diff command: cvs -q diff -uN
Files affected: src/alloc.c
Index: src/alloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v
retrieving revision 1.126
diff -d -u -r1.126 alloc.c
--- src/alloc.c 2006/04/23 20:12:31 1.126
+++ src/alloc.c 2006/06/16 16:53:53
＠＠ -508,8 +508,7 ＠＠
int instances_in_use;
int bytes_in_use;
int bytes_in_use_including_overhead;
-} lrecord_stats [countof (lrecord_implementations_table)
- + MODULE_DEFINABLE_TYPE_COUNT];
+} lrecord_stats [countof (lrecord_implementations_table)];
void
init_lrecord_stats ()
＠＠ -554,8 +553,7 ＠＠
{
int i;
int size = 0;
- for (i = 0; i < (countof (lrecord_implementations_table)
- + MODULE_DEFINABLE_TYPE_COUNT); i++)
+ for (i = 0; i < countof (lrecord_implementations_table); i++)
size += lrecord_stats[i].bytes_in_use;
return size;
}
＠＠ -3433,8 +3431,7 ＠＠
int instances_freed;
int bytes_freed;
int instances_on_free_list;
-} lcrecord_stats [countof (lrecord_implementations_table)
- + MODULE_DEFINABLE_TYPE_COUNT];
+} lcrecord_stats [countof (lrecord_implementations_table)];
static void
tick_lcrecord_stats (const struct lrecord_header *h, int free_p)
＠＠ -4428,8 +4425,7 ＠＠
#ifdef NEW_GC
- for (i = 0; i < (countof (lrecord_implementations_table)
- + MODULE_DEFINABLE_TYPE_COUNT); i++)
+ for (i = 0; i < countof (lrecord_implementations_table); i++)
{
if (lrecord_stats[i].instances_in_use != 0)
{
--
Jerry James, Assistant Professor james(a)xemacs.org
Computer Science Department http://www.cs.usu.edu/~jerry/
Utah State University
- 1 participants
- 1 comments
[COMMIT] Provide sharp S as diaeresis + s in the compose mapping
18 years, 6 months
Aidan Kehoe
Aidan Kehoe
NOTE: This patch has been committed.
lisp/ChangeLog addition:
2006-06-18 Aidan Kehoe <kehoea(a)parhasard.net>
* x-compose.el (compose-diaeresis-map):
Add an entry to map dead_diaeresis + s to ß (LATIN SMALL LETTER
SHARP S).
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: lisp/x-compose.el
Index: lisp/x-compose.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-compose.el,v
retrieving revision 1.4
diff -u -u -r1.4 x-compose.el
--- lisp/x-compose.el 2005/06/26 18:04:50 1.4
+++ lisp/x-compose.el 2006/06/18 21:41:11
＠＠ -231,6 +231,8 ＠＠
(define-key compose-diaeresis-map [e] [(?\353)])
(define-key compose-diaeresis-map [i] [(?\357)])
(define-key compose-diaeresis-map [o] [(?\366)])
+;; Not strictly a diaeresis, but close enough for government work.
+(define-key compose-diaeresis-map [s] [(?\337)])
(define-key compose-diaeresis-map [u] [(?\374)])
(define-key compose-diaeresis-map [y] [(?\377)])
--
Santa Maradona, priez pour moi!
- 1 participants
- 0 comments
[COMMIT] Add support for three PUBLISHING keysyms
18 years, 6 months
Aidan Kehoe
Aidan Kehoe
NOTE: This patch has been committed.
src/ChangeLog addition:
2006-06-18 Aidan Kehoe <kehoea(a)parhasard.net>
* event-xlike-inc.c:
Add support for three publishing keysyms with clear Unicode
mappings. They would have been included in my commit of 2005-06-26
had Markus Kuhn known about them.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: src/event-xlike-inc.c
Index: src/event-xlike-inc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-xlike-inc.c,v
retrieving revision 1.3
diff -u -u -r1.3 event-xlike-inc.c
--- src/event-xlike-inc.c 2006/06/03 17:50:54 1.3
+++ src/event-xlike-inc.c 2006/06/18 18:29:42
＠＠ -352,9 +352,9 ＠＠
0x0, /* #x0AB9 */
0x0, /* #x0ABA */
0x2012, /* #x0ABB FIGURE DASH Publish */
- 0x0, /* #x0ABC LEFT ANGLE BRACKET Publish */
- 0x0, /* #x0ABD DECIMAL POINT Publish */
- 0x0, /* #x0ABE RIGHT ANGLE BRACKET Publish */
+ 0x3008, /* #x0ABC LEFT ANGLE BRACKET Publish */
+ 0x002E, /* #x0ABD DECIMAL POINT Publish */
+ 0x3009, /* #x0ABE RIGHT ANGLE BRACKET Publish */
0x0, /* #x0ABF MARKER Publish */
0x0, /* #x0AC0 */
0x0, /* #x0AC1 */
--
Aidan Kehoe, http://www.parhasard.net/
- 1 participants
- 0 comments
[PATCH 21.5] Union type fixes
18 years, 6 months
Jerry James
Jerry James
PATCH 21.5
This fixes a problem I have encountered when using GCC 4.1. I never had
trouble with earlier versions of GCC, nor with icc. With newer GCCs,
apparently references to bit-restricted fields keep the bit restriction
in subsequent arithmetic operations. This breaks a lot of the bignum
code, in particular.
A similar patch could be applied to XEmacs 21.4, but I don't know if it
is necessary.
src/ChangeLog addition:
2006-06-13 Jerry James <james(a)xemacs.org>
* lisp-union.h: Cast away bit restrictions on values retrieved
from the Lisp_Object union.
xemacs-21.5 source patch:
Diff command: cvs -q diff -uN
Files affected: src/lisp-union.h
Index: src/lisp-union.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp-union.h,v
retrieving revision 1.20
diff -d -u -r1.20 lisp-union.h
--- src/lisp-union.h 2005/10/25 11:16:26 1.20
+++ src/lisp-union.h 2006/06/13 15:34:22
＠＠ -80,11 +80,11 ＠＠
}
Lisp_Object;
-#define XCHARVAL(x) ((x).gu.val)
+#define XCHARVAL(x) ((EMACS_UINT)(x).gu.val)
#define XPNTRVAL(x) ((x).ui)
-#define XREALINT(x) ((x).s.val)
-#define XUINT(x) ((x).u.val)
+#define XREALINT(x) ((EMACS_INT)(x).s.val)
+#define XUINT(x) ((EMACS_UINT)(x).u.val)
#define XTYPE(x) ((x).gu.type)
#define EQ(x,y) ((x).v == (y).v)
--
Jerry James, Assistant Professor james(a)xemacs.org
Computer Science Department http://www.cs.usu.edu/~jerry/
Utah State University
- 1 participants
- 2 comments