diff options
author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2005-02-21 21:08:27 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2005-02-21 21:08:27 +0000 |
commit | 85eb751e4e1683af6cee3ee9dce29f74911a639d (patch) | |
tree | b40f699ee646462a8f223b919ba68dda1d8fc371 /src/GetValues.c | |
parent | 94150cb72d9d641c64325cd70323d93b9a3701a5 (diff) |
Convert lib/Xt to ANSI C (Thomas Dickey). Fixes for a few valgrind warningsXORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_1
(Thomas Dickey).
Diffstat (limited to 'src/GetValues.c')
-rw-r--r-- | src/GetValues.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/GetValues.c b/src/GetValues.c index bb09a27..73ab7b1 100644 --- a/src/GetValues.c +++ b/src/GetValues.c @@ -7,13 +7,13 @@ Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the names of Digital or Sun not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -72,7 +72,7 @@ static int GetValues( Cardinal num_args) /* number of items in arg list */ { register ArgList arg; - register int i; + register Cardinal i; register XrmName argName; register XrmResourceList* xrmres; int translation_arg_num = -1; @@ -183,10 +183,10 @@ static void CallConstraintGetValuesHook( } -void XtGetValues(w, args, num_args) - register Widget w; - register ArgList args; - register Cardinal num_args; +void XtGetValues( + register Widget w, + register ArgList args, + register Cardinal num_args) { WidgetClass wc; int targ; @@ -215,12 +215,12 @@ void XtGetValues(w, args, num_args) /* Get constraint values if necessary */ /* constraints may be NULL if constraint_size==0 */ - if (XtParent(w) != NULL && !XtIsShell(w) && XtIsConstraint(XtParent(w)) && + if (XtParent(w) != NULL && !XtIsShell(w) && XtIsConstraint(XtParent(w)) && w->core.constraints) { ConstraintWidgetClass cwc = (ConstraintWidgetClass) XtClass(XtParent(w)); LOCK_PROCESS; - GetValues((char*)w->core.constraints, + GetValues((char*)w->core.constraints, (XrmResourceList *)(cwc->constraint_class.resources), cwc->constraint_class.num_resources, args, num_args); UNLOCK_PROCESS; @@ -234,12 +234,12 @@ void XtGetValues(w, args, num_args) UNLOCK_APP(app); } /* XtGetValues */ -void XtGetSubvalues(base, resources, num_resources, args, num_args) - XtPointer base; /* Base address to fetch values from */ - XtResourceList resources; /* The current resource values. */ - Cardinal num_resources; /* number of items in resources */ - ArgList args; /* The resource values requested */ - Cardinal num_args; /* number of items in arg list */ +void XtGetSubvalues( + XtPointer base, /* Base address to fetch values from */ + XtResourceList resources, /* The current resource values. */ + Cardinal num_resources, /* number of items in resources */ + ArgList args, /* The resource values requested */ + Cardinal num_args) /* number of items in arg list */ { XrmResourceList* xrmres; xrmres = _XtCreateIndirectionTable(resources, num_resources); |