summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ActionHook.c4
-rw-r--r--src/Alloc.c12
-rw-r--r--src/Callback.c29
-rw-r--r--src/Composite.c15
-rw-r--r--src/Constraint.c4
-rw-r--r--src/Convert.c14
-rw-r--r--src/Converters.c148
-rw-r--r--src/Core.c35
-rw-r--r--src/Create.c9
-rw-r--r--src/Destroy.c14
-rw-r--r--src/Display.c33
-rw-r--r--src/Error.c36
-rw-r--r--src/Event.c20
-rw-r--r--src/EventUtil.c4
-rw-r--r--src/Functions.c4
-rw-r--r--src/Geometry.c48
-rw-r--r--src/GetActKey.c2
-rw-r--r--src/GetResList.c12
-rw-r--r--src/GetValues.c11
-rw-r--r--src/HookObj.c10
-rw-r--r--src/Hooks.c2
-rw-r--r--src/Initialize.c41
-rw-r--r--src/Intrinsic.c20
-rw-r--r--src/Keyboard.c14
-rw-r--r--src/Manage.c15
-rw-r--r--src/NextEvent.c13
-rw-r--r--src/Object.c6
-rw-r--r--src/PassivGrab.c12
-rw-r--r--src/Pointer.c5
-rw-r--r--src/Popup.c10
-rw-r--r--src/RectObj.c6
-rw-r--r--src/ResConfig.c2
-rw-r--r--src/Resources.c27
-rw-r--r--src/Selection.c65
-rw-r--r--src/SetValues.c10
-rw-r--r--src/SetWMCW.c4
-rw-r--r--src/Shell.c58
-rw-r--r--src/TMaction.c38
-rw-r--r--src/TMgrab.c5
-rw-r--r--src/TMkey.c18
-rw-r--r--src/TMparse.c96
-rw-r--r--src/TMprint.c30
-rw-r--r--src/TMstate.c64
-rw-r--r--src/Threads.c6
-rw-r--r--src/VarCreate.c24
-rw-r--r--src/Varargs.c14
-rw-r--r--src/Vendor.c2
-rw-r--r--src/sharedlib.c54
48 files changed, 557 insertions, 568 deletions
diff --git a/src/ActionHook.c b/src/ActionHook.c
index 45e4cfb..1d7a56a 100644
--- a/src/ActionHook.c
+++ b/src/ActionHook.c
@@ -101,7 +101,7 @@ XtAppAddActionHook(XtAppContext app, XtActionHookProc proc, XtPointer closure)
hook->closure = closure;
if (app->action_hook_list == NULL) {
_XtAddCallback(&app->destroy_callbacks,
- FreeActionHookList, (XtPointer) & app->action_hook_list);
+ FreeActionHookList, (XtPointer) &app->action_hook_list);
}
app->action_hook_list = hook;
UNLOCK_APP(app);
@@ -121,7 +121,7 @@ XtRemoveActionHook(XtActionHookId id)
XtFree((XtPointer) hook);
if (app->action_hook_list == NULL)
_XtRemoveCallback(&app->destroy_callbacks, FreeActionHookList,
- (XtPointer) & app->action_hook_list);
+ (XtPointer) &app->action_hook_list);
}
#ifdef DEBUG
else {
diff --git a/src/Alloc.c b/src/Alloc.c
index 2ee061c..8cd3f5b 100644
--- a/src/Alloc.c
+++ b/src/Alloc.c
@@ -119,7 +119,7 @@ _XtAllocError(String type)
}
void
-_XtHeapInit(Heap * heap)
+_XtHeapInit(Heap *heap)
{
heap->start = NULL;
heap->bytes_remaining = 0;
@@ -130,7 +130,7 @@ _XtHeapInit(Heap * heap)
* require varargs macros everywhere, which are only standard in C99 & later.
*/
Cardinal
-XtAsprintf(_XtString * new_string, _Xconst char *_X_RESTRICT_KYWD format, ...)
+XtAsprintf(_XtString *new_string, _Xconst char *_X_RESTRICT_KYWD format, ...)
{
char buf[256];
int len;
@@ -242,7 +242,7 @@ __XtCalloc(unsigned num, unsigned size)
#endif
char *
-_XtHeapAlloc(Heap * heap, Cardinal bytes)
+_XtHeapAlloc(Heap *heap, Cardinal bytes)
{
register char *heap_loc;
@@ -284,7 +284,7 @@ _XtHeapAlloc(Heap * heap, Cardinal bytes)
}
void
-_XtHeapFree(Heap * heap)
+_XtHeapFree(Heap *heap)
{
char *segment = heap->start;
@@ -473,7 +473,7 @@ XtFree(char *ptr)
}
char *
-_XtHeapMalloc(Heap * heap, Cardinal size, const char *file, int line)
+_XtHeapMalloc(Heap *heap, Cardinal size, const char *file, int line)
{
StatsPtr ptr;
unsigned newsize;
@@ -491,7 +491,7 @@ _XtHeapMalloc(Heap * heap, Cardinal size, const char *file, int line)
}
void
-_XtHeapFree(Heap * heap)
+_XtHeapFree(Heap *heap)
{
register StatsPtr mem, next;
diff --git a/src/Callback.c b/src/Callback.c
index bd384d9..0c4ef5c 100644
--- a/src/Callback.c
+++ b/src/Callback.c
@@ -107,7 +107,7 @@ FetchInternalList(Widget widget,
}
void
-_XtAddCallback(InternalCallbackList * callbacks,
+_XtAddCallback(InternalCallbackList *callbacks,
XtCallbackProc callback,
XtPointer closure)
{
@@ -143,7 +143,7 @@ _XtAddCallback(InternalCallbackList * callbacks,
} /* _XtAddCallback */
void
-_XtAddCallbackOnce(register InternalCallbackList * callbacks,
+_XtAddCallbackOnce(register InternalCallbackList *callbacks,
XtCallbackProc callback,
XtPointer closure)
{
@@ -189,7 +189,7 @@ XtAddCallback(Widget widget,
call_data.event_data = (XtPointer) name;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.
- changehook_callbacks, (XtPointer) & call_data);
+ changehook_callbacks, (XtPointer) &call_data);
}
}
UNLOCK_APP(app);
@@ -197,7 +197,7 @@ XtAddCallback(Widget widget,
static void
AddCallbacks(Widget widget _X_UNUSED,
- InternalCallbackList * callbacks,
+ InternalCallbackList *callbacks,
XtCallbackList newcallbacks)
{
register InternalCallbackList icl;
@@ -209,8 +209,7 @@ AddCallbacks(Widget widget _X_UNUSED,
for (j = 0, cl = newcallbacks; cl->callback; cl++, j++);
if (icl && icl->call_state) {
icl->call_state |= _XtCBFreeAfterCalling;
- icl =
- (InternalCallbackList)
+ icl = (InternalCallbackList)
__XtMalloc((Cardinal)
(sizeof(InternalCallbackRec) +
sizeof(XtCallbackRec) * (size_t) (i + j)));
@@ -263,13 +262,13 @@ XtAddCallbacks(Widget widget,
call_data.event_data = (XtPointer) name;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
UNLOCK_APP(app);
} /* XtAddCallbacks */
void
-_XtRemoveCallback(InternalCallbackList * callbacks,
+_XtRemoveCallback(InternalCallbackList *callbacks,
XtCallbackProc callback,
XtPointer closure)
{
@@ -362,7 +361,7 @@ XtRemoveCallback(Widget widget,
call_data.event_data = (XtPointer) name;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
UNLOCK_APP(app);
} /* XtRemoveCallback */
@@ -442,13 +441,13 @@ XtRemoveCallbacks(Widget widget,
call_data.event_data = (XtPointer) name;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
UNLOCK_APP(app);
} /* XtRemoveCallbacks */
void
-_XtRemoveAllCallbacks(InternalCallbackList * callbacks)
+_XtRemoveAllCallbacks(InternalCallbackList *callbacks)
{
register InternalCallbackList icl = *callbacks;
@@ -489,7 +488,7 @@ XtRemoveAllCallbacks(Widget widget, _Xconst char *name)
call_data.event_data = (XtPointer) name;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
UNLOCK_APP(app);
} /* XtRemoveAllCallbacks */
@@ -521,7 +520,7 @@ _XtCompileCallbackList(XtCallbackList xtcallbacks)
} /* _XtCompileCallbackList */
XtCallbackList
-_XtGetCallbackList(InternalCallbackList * callbacks)
+_XtGetCallbackList(InternalCallbackList *callbacks)
{
int i;
InternalCallbackList icl;
@@ -671,8 +670,8 @@ XtCallCallbackList(Widget widget,
void
_XtPeekCallback(Widget widget _X_UNUSED,
XtCallbackList callbacks,
- XtCallbackProc * callback,
- XtPointer * closure)
+ XtCallbackProc *callback,
+ XtPointer *closure)
{
register InternalCallbackList icl = (InternalCallbackList) callbacks;
register XtCallbackList cl;
diff --git a/src/Composite.c b/src/Composite.c
index 5f1c345..469ec09 100644
--- a/src/Composite.c
+++ b/src/Composite.c
@@ -76,14 +76,11 @@ in this Software without prior written authorization from The Open Group.
static XtResource resources[] = {
{XtNchildren, XtCReadOnly, XtRWidgetList, sizeof(WidgetList),
- XtOffsetOf(CompositeRec, composite.children), XtRImmediate, NULL}
- ,
+ XtOffsetOf(CompositeRec, composite.children), XtRImmediate, NULL},
{XtNnumChildren, XtCReadOnly, XtRCardinal, sizeof(Cardinal),
- XtOffsetOf(CompositeRec, composite.num_children), XtRImmediate, NULL}
- ,
+ XtOffsetOf(CompositeRec, composite.num_children), XtRImmediate, NULL},
{XtNinsertPosition, XtCInsertPosition, XtRFunction, sizeof(XtOrderProc),
- XtOffsetOf(CompositeRec, composite.insert_position), XtRImmediate, NULL}
- ,
+ XtOffsetOf(CompositeRec, composite.insert_position), XtRImmediate, NULL},
};
static void CompositeClassPartInitialize(WidgetClass);
@@ -141,7 +138,7 @@ CompositeClassRec compositeClassRec = {
};
externaldef(compositewidgetclass)
-WidgetClass compositeWidgetClass = (WidgetClass) & compositeClassRec;
+WidgetClass compositeWidgetClass = (WidgetClass) &compositeClassRec;
static void
InheritAllowsChangeManagedSet(WidgetClass widget_class)
@@ -192,7 +189,7 @@ CompositeClassPartInitialize(WidgetClass myWidgetClass)
register CompositePartPtr superPtr = NULL;
wcPtr = (CompositePartPtr)
- & (((CompositeWidgetClass) myWidgetClass)->composite_class);
+ &(((CompositeWidgetClass) myWidgetClass)->composite_class);
if (myWidgetClass != compositeWidgetClass) {
/* don't compute possible bogus pointer */
@@ -291,7 +288,7 @@ static void
CompositeInitialize(Widget requested_widget _X_UNUSED,
Widget new_widget,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
register CompositeWidget cw;
diff --git a/src/Constraint.c b/src/Constraint.c
index fd64963..45a0b2a 100644
--- a/src/Constraint.c
+++ b/src/Constraint.c
@@ -80,7 +80,7 @@ externaldef(constraintclassrec)
ConstraintClassRec constraintClassRec = {
{
/******* CorePart *******/
- /* superclass */ (WidgetClass) & compositeClassRec,
+ /* superclass */ (WidgetClass) &compositeClassRec,
/* class_name */ "Constraint",
/* widget_size */ sizeof(ConstraintRec),
/* class_initialize */ NULL,
@@ -134,7 +134,7 @@ ConstraintClassRec constraintClassRec = {
};
externaldef(constraintwidgetclass)
-WidgetClass constraintWidgetClass = (WidgetClass) & constraintClassRec;
+WidgetClass constraintWidgetClass = (WidgetClass) &constraintClassRec;
static void
ConstraintPartInitialize(WidgetClass wc)
diff --git a/src/Convert.c b/src/Convert.c
index e95ccb0..9b2d465 100644
--- a/src/Convert.c
+++ b/src/Convert.c
@@ -101,7 +101,7 @@ typedef struct _ConverterRec {
static Heap globalHeap = { NULL, NULL, 0 };
void
-_XtSetDefaultConverterTable(ConverterTable * table)
+_XtSetDefaultConverterTable(ConverterTable *table)
{
register ConverterTable globalConverterTable;
@@ -346,7 +346,7 @@ XtAppAddConverter(XtAppContext app,
}
static CachePtr
-CacheEnter(Heap * heap,
+CacheEnter(Heap *heap,
register XtTypeConverter converter,
register XrmValuePtr args,
Cardinal num_args,
@@ -536,7 +536,7 @@ _XtConverterCacheStats(void)
static Boolean
ResourceQuarkToOffset(WidgetClass widget_class,
XrmName name,
- Cardinal * offset)
+ Cardinal *offset)
{
WidgetClass wc;
Cardinal i;
@@ -733,7 +733,7 @@ CallConverter(Display *dpy,
Cardinal num_args,
register XrmValuePtr from,
XrmValuePtr to,
- XtCacheRef * cache_ref_return,
+ XtCacheRef *cache_ref_return,
register ConverterPtr cP)
{
CachePtr p;
@@ -876,7 +876,7 @@ XtCallConverter(Display *dpy,
Cardinal num_args,
register XrmValuePtr from,
XrmValuePtr to,
- XtCacheRef * cache_ref_return)
+ XtCacheRef *cache_ref_return)
{
ConverterPtr cP;
Boolean retval;
@@ -901,7 +901,7 @@ _XtConvert(Widget widget,
XrmValuePtr from,
register XrmRepresentation to_type,
register XrmValuePtr to,
- XtCacheRef * cache_ref_return)
+ XtCacheRef *cache_ref_return)
{
XtAppContext app = XtWidgetToApplicationContext(widget);
register ConverterPtr p;
@@ -1087,7 +1087,7 @@ XtConvertAndStore(Widget object,
}
void
-XtAppReleaseCacheRefs(XtAppContext app, XtCacheRef * refs)
+XtAppReleaseCacheRefs(XtAppContext app, XtCacheRef *refs)
{
register CachePtr *r;
register CachePtr p;
diff --git a/src/Converters.c b/src/Converters.c
index 9bb107a..4c27623 100644
--- a/src/Converters.c
+++ b/src/Converters.c
@@ -309,10 +309,10 @@ IsInteger(String string, int *value)
Boolean
XtCvtIntToBoolean(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
if (*num_args != 0)
XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
@@ -326,10 +326,10 @@ XtCvtIntToBoolean(Display *dpy,
Boolean
XtCvtIntToShort(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
if (*num_args != 0)
XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
@@ -342,10 +342,10 @@ XtCvtIntToShort(Display *dpy,
Boolean
XtCvtStringToBoolean(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
String str = (String) fromVal->addr;
@@ -375,10 +375,10 @@ XtCvtStringToBoolean(Display *dpy,
Boolean
XtCvtIntToBool(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
if (*num_args != 0)
XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
@@ -391,10 +391,10 @@ XtCvtIntToBool(Display *dpy,
Boolean
XtCvtStringToBool(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
String str = (String) fromVal->addr;
@@ -433,10 +433,10 @@ XtConvertArgRec const colorConvertArgs[] = {
Boolean
XtCvtIntToColor(Display *dpy,
XrmValuePtr args,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
XColor c;
Screen *screen;
@@ -461,10 +461,10 @@ XtCvtIntToColor(Display *dpy,
Boolean
XtCvtStringToPixel(Display *dpy,
XrmValuePtr args,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret)
+ XtPointer *closure_ret)
{
String str = (String) fromVal->addr;
XColor screenColor;
@@ -541,7 +541,7 @@ FreePixel(XtAppContext app,
XrmValuePtr toVal,
XtPointer closure,
XrmValuePtr args,
- Cardinal * num_args)
+ Cardinal *num_args)
{
Screen *screen;
Colormap colormap;
@@ -569,7 +569,7 @@ XtConvertArgRec const screenConvertArg[] = {
};
static void
-FetchDisplayArg(Widget widget, Cardinal * size _X_UNUSED, XrmValue *value)
+FetchDisplayArg(Widget widget, Cardinal *size _X_UNUSED, XrmValue *value)
{
if (widget == NULL) {
XtErrorMsg("missingWidget", "fetchDisplayArg", XtCXtToolkitError,
@@ -593,10 +593,10 @@ static XtConvertArgRec const displayConvertArg[] = {
Boolean
XtCvtStringToCursor(Display *dpy,
XrmValuePtr args,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
/* *INDENT-OFF* */
static const struct _CursorName {
@@ -712,7 +712,7 @@ FreeCursor(XtAppContext app,
XrmValuePtr toVal,
XtPointer closure _X_UNUSED,
XrmValuePtr args,
- Cardinal * num_args)
+ Cardinal *num_args)
{
Display *display;
@@ -730,10 +730,10 @@ FreeCursor(XtAppContext app,
Boolean
XtCvtStringToDisplay(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
Display *d;
@@ -755,10 +755,10 @@ XtCvtStringToDisplay(Display *dpy,
Boolean
XtCvtStringToFile(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
FILE *f;
@@ -782,7 +782,7 @@ FreeFile(XtAppContext app,
XrmValuePtr toVal,
XtPointer closure _X_UNUSED,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args)
+ Cardinal *num_args)
{
if (*num_args != 0)
XtAppWarningMsg(app,
@@ -795,10 +795,10 @@ FreeFile(XtAppContext app,
Boolean
XtCvtIntToFloat(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
if (*num_args != 0)
XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
@@ -811,10 +811,10 @@ XtCvtIntToFloat(Display *dpy,
Boolean
XtCvtStringToFloat(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
int ret;
float f, nan;
@@ -842,10 +842,10 @@ XtCvtStringToFloat(Display *dpy,
Boolean
XtCvtStringToFont(Display *dpy,
XrmValuePtr args,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
Font f;
Display *display;
@@ -920,7 +920,7 @@ FreeFont(XtAppContext app,
XrmValuePtr toVal,
XtPointer closure _X_UNUSED,
XrmValuePtr args,
- Cardinal * num_args)
+ Cardinal *num_args)
{
Display *display;
@@ -938,10 +938,10 @@ FreeFont(XtAppContext app,
Boolean
XtCvtIntToFont(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
if (*num_args != 0)
XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
@@ -954,10 +954,10 @@ XtCvtIntToFont(Display *dpy,
Boolean
XtCvtStringToFontSet(Display *dpy,
XrmValuePtr args,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
XFontSet f;
Display *display;
@@ -1064,7 +1064,8 @@ static void
FreeFontSet(XtAppContext app,
XrmValuePtr toVal,
XtPointer closure _X_UNUSED,
- XrmValuePtr args, Cardinal * num_args)
+ XrmValuePtr args,
+ Cardinal *num_args)
{
Display *display;
@@ -1082,7 +1083,7 @@ FreeFontSet(XtAppContext app,
static void
FetchLocaleArg(Widget widget _X_UNUSED,
- Cardinal * size _X_UNUSED,
+ Cardinal *size _X_UNUSED,
XrmValue *value)
{
static XrmString locale;
@@ -1103,10 +1104,10 @@ static XtConvertArgRec const localeDisplayConvertArgs[] = {
Boolean
XtCvtStringToFontStruct(Display *dpy,
XrmValuePtr args,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
XFontStruct *f;
Display *display;
@@ -1186,7 +1187,7 @@ FreeFontStruct(XtAppContext app,
XrmValuePtr toVal,
XtPointer closure _X_UNUSED,
XrmValuePtr args,
- Cardinal * num_args)
+ Cardinal *num_args)
{
Display *display;
@@ -1205,10 +1206,10 @@ FreeFontStruct(XtAppContext app,
Boolean
XtCvtStringToInt(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
int i;
@@ -1227,10 +1228,10 @@ XtCvtStringToInt(Display *dpy,
Boolean
XtCvtStringToShort(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
int i;
@@ -1250,10 +1251,10 @@ XtCvtStringToShort(Display *dpy,
Boolean
XtCvtStringToDimension(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
int i;
@@ -1276,10 +1277,10 @@ XtCvtStringToDimension(Display *dpy,
Boolean
XtCvtIntToUnsignedChar(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
if (*num_args != 0)
XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
@@ -1293,10 +1294,10 @@ XtCvtIntToUnsignedChar(Display *dpy,
Boolean
XtCvtStringToUnsignedChar(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
int i;
@@ -1320,10 +1321,10 @@ XtCvtStringToUnsignedChar(Display *dpy,
Boolean
XtCvtColorToPixel(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
if (*num_args != 0)
XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
@@ -1337,10 +1338,10 @@ XtCvtColorToPixel(Display *dpy,
Boolean
XtCvtIntToPixel(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
if (*num_args != 0)
XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
@@ -1353,10 +1354,10 @@ XtCvtIntToPixel(Display *dpy,
Boolean
XtCvtIntToPixmap(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
if (*num_args != 0)
XtAppWarningMsg(XtDisplayToApplicationContext(dpy),
@@ -1438,10 +1439,10 @@ CopyISOLatin1Lowered(char *dst, const char *src)
Boolean
XtCvtStringToInitialState(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
String str = (String) fromVal->addr;
@@ -1479,10 +1480,10 @@ static XtConvertArgRec const visualConvertArgs[] = {
Boolean
XtCvtStringToVisual(Display *dpy, XrmValuePtr args, /* Screen, depth */
- Cardinal * num_args, /* 2 */
+ Cardinal *num_args, /* 2 */
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
String str = (String) fromVal->addr;
int vc;
@@ -1539,10 +1540,10 @@ XtCvtStringToVisual(Display *dpy, XrmValuePtr args, /* Screen, depth */
Boolean
XtCvtStringToAtom(Display *dpy,
XrmValuePtr args,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
Atom atom;
@@ -1562,10 +1563,10 @@ XtCvtStringToAtom(Display *dpy,
Boolean
XtCvtStringToDirectoryString(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
String str;
char directory[PATH_MAX + 1];
@@ -1609,7 +1610,7 @@ FreeDirectoryString(XtAppContext app,
XrmValuePtr toVal,
XtPointer closure _X_UNUSED,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args)
+ Cardinal *num_args)
{
if (*num_args != 0)
XtAppWarningMsg(app,
@@ -1624,10 +1625,10 @@ FreeDirectoryString(XtAppContext app,
Boolean
XtCvtStringToRestartStyle(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
String str = (String) fromVal->addr;
@@ -1657,10 +1658,10 @@ XtCvtStringToRestartStyle(Display *dpy,
Boolean
XtCvtStringToCommandArgArray(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret)
+ XtPointer *closure_ret)
{
String *strarray, *ptr;
char *src;
@@ -1718,8 +1719,7 @@ XtCvtStringToCommandArgArray(Display *dpy,
dst++;
}
- ptr = strarray =
- (String *)
+ ptr = strarray = (String *)
__XtMalloc((Cardinal) ((size_t) (tokens + 1) * sizeof(String)));
src = dst_str;
while (--tokens >= 0) {
@@ -1741,7 +1741,7 @@ ArgArrayDestructor(XtAppContext app _X_UNUSED,
XrmValuePtr toVal _X_UNUSED,
XtPointer closure,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
if (closure) {
_XtString *strarray = (_XtString *) closure;
@@ -1754,10 +1754,10 @@ ArgArrayDestructor(XtAppContext app _X_UNUSED,
Boolean
XtCvtStringToGravity(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr fromVal,
XrmValuePtr toVal,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
/* *INDENT-OFF* */
static struct _namepair {
diff --git a/src/Core.c b/src/Core.c
index bdbd2c8..d728a92 100644
--- a/src/Core.c
+++ b/src/Core.c
@@ -103,32 +103,25 @@ parameter is not passed through to the XtRCallProc routines */
XtRCallProc, (XtPointer) _XtCopyFromParent},
{XtNcolormap, XtCColormap, XtRColormap, sizeof(Colormap),
XtOffsetOf(CoreRec, core.colormap),
- XtRCallProc, (XtPointer) _XtCopyFromParent}
- ,
+ XtRCallProc, (XtPointer) _XtCopyFromParent},
{XtNbackground, XtCBackground, XtRPixel, sizeof(Pixel),
XtOffsetOf(CoreRec, core.background_pixel),
- XtRString, (XtPointer) "XtDefaultBackground"}
- ,
+ XtRString, (XtPointer) "XtDefaultBackground"},
{XtNbackgroundPixmap, XtCPixmap, XtRPixmap, sizeof(Pixmap),
XtOffsetOf(CoreRec, core.background_pixmap),
- XtRImmediate, (XtPointer) XtUnspecifiedPixmap}
- ,
+ XtRImmediate, (XtPointer) XtUnspecifiedPixmap},
{XtNborderColor, XtCBorderColor, XtRPixel, sizeof(Pixel),
XtOffsetOf(CoreRec, core.border_pixel),
- XtRString, (XtPointer) "XtDefaultForeground"}
- ,
+ XtRString, (XtPointer) "XtDefaultForeground"},
{XtNborderPixmap, XtCPixmap, XtRPixmap, sizeof(Pixmap),
XtOffsetOf(CoreRec, core.border_pixmap),
- XtRImmediate, (XtPointer) XtUnspecifiedPixmap}
- ,
+ XtRImmediate, (XtPointer) XtUnspecifiedPixmap},
{XtNmappedWhenManaged, XtCMappedWhenManaged, XtRBoolean, sizeof(Boolean),
XtOffsetOf(CoreRec, core.mapped_when_managed),
- XtRImmediate, (XtPointer) True}
- ,
+ XtRImmediate, (XtPointer) True},
{XtNtranslations, XtCTranslations, XtRTranslationTable,
sizeof(XtTranslations), XtOffsetOf(CoreRec, core.tm.translations),
- XtRTranslationTable, (XtPointer) NULL}
- ,
+ XtRTranslationTable, (XtPointer) NULL},
{XtNaccelerators, XtCAccelerators, XtRAcceleratorTable,
sizeof(XtTranslations), XtOffsetOf(CoreRec, core.accelerators),
XtRTranslationTable, (XtPointer) NULL}
@@ -144,7 +137,7 @@ static void CoreSetValuesAlmost(Widget, Widget, XtWidgetGeometry *,
static RectObjClassRec unNamedObjClassRec = {
{
- /* superclass */ (WidgetClass) & rectObjClassRec,
+ /* superclass */ (WidgetClass) &rectObjClassRec,
/* class_name */ "UnNamedObj",
/* widget_size */ 0,
/* class_initialize */ NULL,
@@ -182,7 +175,7 @@ static RectObjClassRec unNamedObjClassRec = {
externaldef(widgetclassrec)
WidgetClassRec widgetClassRec = {
{
- /* superclass */ (WidgetClass) & unNamedObjClassRec,
+ /* superclass */ (WidgetClass) &unNamedObjClassRec,
/* class_name */ "Core",
/* widget_size */ sizeof(WidgetRec),
/* class_initialize */ NULL,
@@ -285,7 +278,7 @@ static void
CoreInitialize(Widget requested_widget _X_UNUSED,
register Widget new_widget,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
XtTranslations save1, save2;
@@ -308,7 +301,7 @@ CoreInitialize(Widget requested_widget _X_UNUSED,
static void
CoreRealize(Widget widget,
- XtValueMask * value_mask,
+ XtValueMask *value_mask,
XSetWindowAttributes *attributes)
{
XtCreateWindow(widget, (unsigned int) InputOutput,
@@ -332,7 +325,7 @@ CoreSetValues(Widget old,
Widget reference _X_UNUSED,
Widget new,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
Boolean redisplay;
Mask window_mask;
@@ -414,8 +407,8 @@ CoreSetValues(Widget old,
static void
CoreSetValuesAlmost(Widget old _X_UNUSED,
Widget new _X_UNUSED,
- XtWidgetGeometry * request,
- XtWidgetGeometry * reply)
+ XtWidgetGeometry *request,
+ XtWidgetGeometry *reply)
{
*request = *reply;
}
diff --git a/src/Create.c b/src/Create.c
index 952c1d5..27df827 100644
--- a/src/Create.c
+++ b/src/Create.c
@@ -297,9 +297,8 @@ xtWidgetAlloc(WidgetClass widget_class,
sizeof(unsigned long) +
sizeof(double))) {
if (csize && !(csize & (sizeof(double) - 1)))
- wsize =
- (Cardinal) ((wsize + sizeof(double) -
- 1) & ~(sizeof(double) - 1));
+ wsize = (Cardinal) ((wsize + sizeof(double) - 1)
+ & ~(sizeof(double) - 1));
}
}
widget = (Widget) __XtCalloc(1, (unsigned) (wsize + csize));
@@ -330,7 +329,7 @@ CompileCallbacks(Widget widget)
((char *) widget - (*offsets)->xrm_offset - 1);
if (*cl)
- *cl = _XtCompileCallbackList((XtCallbackList) * cl);
+ *cl = _XtCompileCallbackList((XtCallbackList) *cl);
}
UNLOCK_PROCESS;
}
@@ -448,7 +447,7 @@ xtCreate(String name,
call_data.num_args = num_args;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.
- createhook_callbacks, (XtPointer) & call_data);
+ createhook_callbacks, (XtPointer) &call_data);
}
}
if (typed_args != NULL) {
diff --git a/src/Destroy.c b/src/Destroy.c
index 6dd48f6..3c6e564 100644
--- a/src/Destroy.c
+++ b/src/Destroy.c
@@ -116,7 +116,7 @@ Phase1Destroy(Widget widget)
call_data.widget = widget;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.destroyhook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
} /* Phase1Destroy */
@@ -172,11 +172,13 @@ Phase2Destroy(register Widget widget)
}
/* Call widget deallocate procedure */
- ext = (ObjectClassExtension)
- XtGetClassExtension(widget->core.widget_class,
- XtOffsetOf(CoreClassPart, extension),
- NULLQUARK, XtObjectExtensionVersion,
- sizeof(ObjectClassExtensionRec));
+ ext = (ObjectClassExtension) XtGetClassExtension(widget->core.widget_class,
+ XtOffsetOf(CoreClassPart,
+ extension),
+ NULLQUARK,
+ XtObjectExtensionVersion,
+ sizeof
+ (ObjectClassExtensionRec));
if (ext && ext->deallocate) {
XtDeallocateProc deallocate;
diff --git a/src/Display.c b/src/Display.c
index be68927..0bfaac9 100644
--- a/src/Display.c
+++ b/src/Display.c
@@ -171,6 +171,7 @@ NewPerDisplay(Display *dpy)
PerDisplayTablePtr pd;
pd = XtNew(PerDisplayTable);
+
LOCK_PROCESS;
pd->dpy = dpy;
pd->next = _XtperDisplayList;
@@ -256,7 +257,7 @@ XtOpenDisplay(XtAppContext app,
XrmOptionDescRec *urlist,
Cardinal num_urs,
int *argc,
- _XtString * argv)
+ _XtString *argv)
{
Display *d;
XrmDatabase db = NULL;
@@ -266,7 +267,7 @@ XtOpenDisplay(XtAppContext app,
LOCK_PROCESS;
/* parse the command line for name, display, and/or language */
db = _XtPreparseCommandLine(urlist, num_urs, *argc, argv,
- (String *) & applName,
+ (String *) &applName,
(String *) (displayName ? NULL : &displayName),
(app->process->globalLangProcRec.proc ?
&language : NULL));
@@ -314,22 +315,21 @@ XtOpenDisplay(XtAppContext app,
}
Display *
-_XtAppInit(XtAppContext * app_context_return,
+_XtAppInit(XtAppContext *app_context_return,
String application_class,
XrmOptionDescRec *options,
Cardinal num_options,
int *argc_in_out,
- _XtString ** argv_in_out,
- String * fallback_resources)
+ _XtString **argv_in_out,
+ String *fallback_resources)
{
_XtString *saved_argv;
int i;
Display *dpy;
-/*
- * Save away argv and argc so we can set the properties later
- */
-
+ /*
+ * Save away argv and argc so we can set the properties later
+ */
saved_argv = (_XtString *)
__XtMalloc((Cardinal)
((size_t) (*argc_in_out + 1) * sizeof(_XtString)));
@@ -369,7 +369,7 @@ XtDisplayInitialize(XtAppContext app,
XrmOptionDescRec *urlist,
Cardinal num_urs,
int *argc,
- _XtString * argv)
+ _XtString *argv)
{
XtPerDisplay pd;
XrmDatabase db = NULL;
@@ -484,7 +484,7 @@ DestroyAppContext(XtAppContext app)
if (app->list != NULL)
XtFree((char *) app->list);
_XtFreeConverterTable(app->converterTable);
- _XtCacheFlushTag(app, (XtPointer) & app->heap);
+ _XtCacheFlushTag(app, (XtPointer) &app->heap);
_XtFreeActions(app->action_table);
if (app->destroy_callbacks != NULL) {
XtCallCallbackList((Widget) NULL,
@@ -675,7 +675,7 @@ CloseDisplay(Display *dpy)
xtpd->modKeysyms = NULL;
xtpd->modsToKeysyms = NULL;
XDestroyRegion(xtpd->region);
- _XtCacheFlushTag(xtpd->appContext, (XtPointer) & xtpd->heap);
+ _XtCacheFlushTag(xtpd->appContext, (XtPointer) &xtpd->heap);
_XtGClistFree(dpy, xtpd);
XtFree((char *) xtpd->pdi.trace);
_XtHeapFree(&xtpd->heap);
@@ -758,8 +758,8 @@ XtWidgetToApplicationContext(Widget w)
void
XtGetApplicationNameAndClass(Display *dpy,
- String * name_return,
- String * class_return)
+ String *name_return,
+ String *class_return)
{
XtPerDisplay pd;
@@ -797,14 +797,13 @@ _XtGetPerDisplayInput(Display *display)
void
XtGetDisplays(XtAppContext app_context,
Display ***dpy_return,
- Cardinal * num_dpy_return)
+ Cardinal *num_dpy_return)
{
int ii;
LOCK_APP(app_context);
*num_dpy_return = (Cardinal) app_context->count;
- *dpy_return =
- (Display **)
+ *dpy_return = (Display **)
__XtMalloc((Cardinal)
((size_t) app_context->count * sizeof(Display *)));
for (ii = 0; ii < app_context->count; ii++)
diff --git a/src/Error.c b/src/Error.c
index 139fc9a..4bf4713 100644
--- a/src/Error.c
+++ b/src/Error.c
@@ -240,8 +240,8 @@ DefaultMsg(String name,
String type,
String class,
String defaultp,
- String * params,
- Cardinal * num_params,
+ String *params,
+ Cardinal *num_params,
Bool error,
void (*fn) (_Xconst _XtString))
{
@@ -336,8 +336,8 @@ _XtDefaultErrorMsg(String name,
String type,
String class,
String defaultp,
- String * params,
- Cardinal * num_params)
+ String *params,
+ Cardinal *num_params)
{
DefaultMsg(name, type, class, defaultp, params, num_params, True, XtError);
}
@@ -347,8 +347,8 @@ _XtDefaultWarningMsg(String name,
String type,
String class,
String defaultp,
- String * params,
- Cardinal * num_params)
+ String *params,
+ Cardinal *num_params)
{
DefaultMsg(name, type, class, defaultp, params, num_params, False,
XtWarning);
@@ -359,8 +359,8 @@ XtErrorMsg(_Xconst char *name,
_Xconst char *type,
_Xconst char *class,
_Xconst char *defaultp,
- String * params,
- Cardinal * num_params)
+ String *params,
+ Cardinal *num_params)
{
#if GLOBALERRORS
LOCK_PROCESS;
@@ -380,8 +380,8 @@ XtAppErrorMsg(XtAppContext app _X_UNUSED,
_Xconst char *type,
_Xconst char *class,
_Xconst char *defaultp,
- String * params,
- Cardinal * num_params)
+ String *params,
+ Cardinal *num_params)
{
#if GLOBALERRORS
LOCK_PROCESS;
@@ -400,7 +400,9 @@ void
XtWarningMsg(_Xconst char *name,
_Xconst char *type,
_Xconst char *class,
- _Xconst char *defaultp, String * params, Cardinal * num_params)
+ _Xconst char *defaultp,
+ String *params,
+ Cardinal *num_params)
{
#if GLOBALERRORS
LOCK_PROCESS;
@@ -419,8 +421,8 @@ XtAppWarningMsg(XtAppContext app _X_UNUSED,
_Xconst char *type,
_Xconst char *class,
_Xconst char *defaultp,
- String * params,
- Cardinal * num_params)
+ String *params,
+ Cardinal *num_params)
{
#if GLOBALERRORS
LOCK_PROCESS;
@@ -665,10 +667,10 @@ XtAppSetWarningHandler(XtAppContext app _X_UNUSED, XtErrorHandler handler)
}
void
-_XtSetDefaultErrorHandlers(XtErrorMsgHandler * errMsg _X_UNUSED,
- XtErrorMsgHandler * warnMsg _X_UNUSED,
- XtErrorHandler * err _X_UNUSED,
- XtErrorHandler * warn _X_UNUSED)
+_XtSetDefaultErrorHandlers(XtErrorMsgHandler *errMsg _X_UNUSED,
+ XtErrorMsgHandler *warnMsg _X_UNUSED,
+ XtErrorHandler *err _X_UNUSED,
+ XtErrorHandler *warn _X_UNUSED)
{
#ifndef GLOBALERRORS
LOCK_PROCESS;
diff --git a/src/Event.c b/src/Event.c
index 2c3b73c..dadcede 100644
--- a/src/Event.c
+++ b/src/Event.c
@@ -142,7 +142,7 @@ XtBuildEventMask(Widget widget)
}
static void
-CallExtensionSelector(Widget widget, ExtSelectRec * rec, Boolean forceCall)
+CallExtensionSelector(Widget widget, ExtSelectRec *rec, Boolean forceCall)
{
XtEventRec *p;
XtPointer *data;
@@ -414,7 +414,7 @@ XtRemoveEventHandler(Widget widget,
{
WIDGET_TO_APPCON(widget);
LOCK_APP(app);
- RemoveEventHandler(widget, (XtPointer) & eventMask, 0, FALSE,
+ RemoveEventHandler(widget, (XtPointer) &eventMask, 0, FALSE,
(Boolean) other, proc, closure, FALSE);
UNLOCK_APP(app);
}
@@ -428,7 +428,7 @@ XtAddEventHandler(Widget widget,
{
WIDGET_TO_APPCON(widget);
LOCK_APP(app);
- AddEventHandler(widget, (XtPointer) & eventMask, 0, FALSE, (Boolean) other,
+ AddEventHandler(widget, (XtPointer) &eventMask, 0, FALSE, (Boolean) other,
proc, closure, XtListTail, FALSE, FALSE);
UNLOCK_APP(app);
}
@@ -443,7 +443,7 @@ XtInsertEventHandler(Widget widget,
{
WIDGET_TO_APPCON(widget);
LOCK_APP(app);
- AddEventHandler(widget, (XtPointer) & eventMask, 0, FALSE, (Boolean) other,
+ AddEventHandler(widget, (XtPointer) &eventMask, 0, FALSE, (Boolean) other,
proc, closure, position, TRUE, FALSE);
UNLOCK_APP(app);
}
@@ -457,7 +457,7 @@ XtRemoveRawEventHandler(Widget widget,
{
WIDGET_TO_APPCON(widget);
LOCK_APP(app);
- RemoveEventHandler(widget, (XtPointer) & eventMask, 0, FALSE,
+ RemoveEventHandler(widget, (XtPointer) &eventMask, 0, FALSE,
(Boolean) other, proc, closure, TRUE);
UNLOCK_APP(app);
}
@@ -472,7 +472,7 @@ XtInsertRawEventHandler(Widget widget,
{
WIDGET_TO_APPCON(widget);
LOCK_APP(app);
- AddEventHandler(widget, (XtPointer) & eventMask, 0, FALSE, (Boolean) other,
+ AddEventHandler(widget, (XtPointer) &eventMask, 0, FALSE, (Boolean) other,
proc, closure, position, TRUE, TRUE);
UNLOCK_APP(app);
}
@@ -486,7 +486,7 @@ XtAddRawEventHandler(Widget widget,
{
WIDGET_TO_APPCON(widget);
LOCK_APP(app);
- AddEventHandler(widget, (XtPointer) & eventMask, 0, FALSE, (Boolean) other,
+ AddEventHandler(widget, (XtPointer) &eventMask, 0, FALSE, (Boolean) other,
proc, closure, XtListTail, FALSE, TRUE);
UNLOCK_APP(app);
}
@@ -634,7 +634,7 @@ XtUnregisterDrawable(Display *display, Drawable drawable)
}
} while (entry != widget);
}
- tab->entries[idx] = (Widget) & WWfake;
+ tab->entries[idx] = (Widget) &WWfake;
tab->fakes++;
}
UNLOCK_PROCESS;
@@ -1237,7 +1237,7 @@ _XtConvertTypeToMask(int eventType)
}
Boolean
-_XtOnGrabList(register Widget widget, XtGrabRec * grabList)
+_XtOnGrabList(register Widget widget, XtGrabRec *grabList)
{
register XtGrabRec *gl;
@@ -1626,7 +1626,7 @@ XtAppMainLoop(XtAppContext app)
}
void
-_XtFreeEventTable(XtEventTable * event_table)
+_XtFreeEventTable(XtEventTable *event_table)
{
register XtEventTable event;
diff --git a/src/EventUtil.c b/src/EventUtil.c
index 1daf7df..848cead 100644
--- a/src/EventUtil.c
+++ b/src/EventUtil.c
@@ -133,7 +133,7 @@ _XtGetPerWidgetInput(Widget widget, _XtBoolean create)
}
void
-_XtFillAncestorList(Widget ** listPtr,
+_XtFillAncestorList(Widget **listPtr,
int *maxElemsPtr,
int *numElemsPtr,
Widget start,
@@ -156,7 +156,7 @@ _XtFillAncestorList(Widget ** listPtr,
for (i = 1, w = XtParent(start);
w != NULL && !XtIsShell(trace[i - 1]) && trace[i - 1] != breakWidget;
w = XtParent(w), i++) {
- if (i == (Cardinal) * maxElemsPtr) {
+ if (i == (Cardinal) *maxElemsPtr) {
/* This should rarely happen, but if it does it'll probably
happen again, so grow the ancestor list */
*maxElemsPtr += CACHESIZE;
diff --git a/src/Functions.c b/src/Functions.c
index d66e7e5..1e15f57 100644
--- a/src/Functions.c
+++ b/src/Functions.c
@@ -182,7 +182,7 @@ XtMapWidget(Widget w)
call_data.widget = w;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
UNLOCK_APP(app);
}
@@ -205,7 +205,7 @@ XtUnmapWidget(Widget w)
call_data.widget = w;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
UNLOCK_APP(app);
}
diff --git a/src/Geometry.c b/src/Geometry.c
index 513a5fb..3704cb6 100644
--- a/src/Geometry.c
+++ b/src/Geometry.c
@@ -105,9 +105,9 @@ ClearRectObjAreas(RectObj r, XWindowChanges *old)
XtGeometryResult
_XtMakeGeometryRequest(Widget widget,
- XtWidgetGeometry * request,
- XtWidgetGeometry * reply,
- Boolean * clear_rect_obj)
+ XtWidgetGeometry *request,
+ XtWidgetGeometry *reply,
+ Boolean *clear_rect_obj)
{
XtWidgetGeometry junk;
XtGeometryHandler manager = (XtGeometryHandler) NULL;
@@ -124,9 +124,8 @@ _XtMakeGeometryRequest(Widget widget,
CALLGEOTAT(_XtGeoTrace(widget,
"\"%s\" is making a %sgeometry request to its parent \"%s\".\n",
XtName(widget),
- ((request->
- request_mode & XtCWQueryOnly)) ? "query only " :
- "",
+ ((request->request_mode & XtCWQueryOnly)) ?
+ "query only " : "",
(XtParent(widget)) ? XtName(XtParent(widget)) :
"Root"));
CALLGEOTAT(_XtGeoTab(1));
@@ -446,10 +445,8 @@ _XtMakeGeometryRequest(Widget widget,
req.changes.sibling = XtWindow(request->sibling);
else
req.changeMask =
- (XtGeometryMask) (req.
- changeMask & (unsigned
- long) (~(CWStackMode |
- CWSibling)));
+ (XtGeometryMask) (req.changeMask & (unsigned long)
+ (~(CWStackMode | CWSibling)));
}
}
@@ -482,7 +479,7 @@ _XtMakeGeometryRequest(Widget widget,
req.widget = widget;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.confighook_callbacks,
- (XtPointer) & req);
+ (XtPointer) &req);
}
return returnCode;
@@ -492,8 +489,8 @@ _XtMakeGeometryRequest(Widget widget,
XtGeometryResult
XtMakeGeometryRequest(Widget widget,
- XtWidgetGeometry * request,
- XtWidgetGeometry * reply)
+ XtWidgetGeometry *request,
+ XtWidgetGeometry *reply)
{
Boolean junk;
XtGeometryResult r;
@@ -509,14 +506,14 @@ XtMakeGeometryRequest(Widget widget,
call_data.request = request;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.geometryhook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
call_data.result = r =
_XtMakeGeometryRequest(widget, request, reply, &junk);
call_data.type = XtHpostGeometry;
call_data.reply = reply;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.geometryhook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
else {
r = _XtMakeGeometryRequest(widget, request, reply, &junk);
@@ -530,8 +527,8 @@ XtGeometryResult
XtMakeResizeRequest(Widget widget,
_XtDimension width,
_XtDimension height,
- Dimension * replyWidth,
- Dimension * replyHeight)
+ Dimension *replyWidth,
+ Dimension *replyHeight)
{
XtWidgetGeometry request, reply;
XtGeometryResult r;
@@ -552,14 +549,14 @@ XtMakeResizeRequest(Widget widget,
call_data.request = &request;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.geometryhook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
call_data.result = r =
_XtMakeGeometryRequest(widget, &request, &reply, &junk);
call_data.type = XtHpostGeometry;
call_data.reply = &reply;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.geometryhook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
else {
r = _XtMakeGeometryRequest(widget, &request, &reply, &junk);
@@ -603,7 +600,7 @@ XtResizeWindow(Widget w)
req.widget = w;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.
- confighook_callbacks, (XtPointer) & req);
+ confighook_callbacks, (XtPointer) &req);
}
}
UNLOCK_APP(app);
@@ -699,7 +696,7 @@ XtConfigureWidget(Widget w,
req.widget = w;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.
- confighook_callbacks, (XtPointer) & req);
+ confighook_callbacks, (XtPointer) &req);
}
{
XtWidgetProc resize;
@@ -733,8 +730,8 @@ void
XtTranslateCoords(register Widget w,
_XtPosition x,
_XtPosition y,
- register Position * rootx, /* return */
- register Position * rooty) /* return */
+ register Position *rootx, /* return */
+ register Position *rooty) /* return */
{
Position garbagex, garbagey;
XtAppContext app = XtWidgetToApplicationContext(w);
@@ -767,8 +764,9 @@ XtTranslateCoords(register Widget w,
UNLOCK_APP(app);
}
-XtGeometryResult XtQueryGeometry(Widget widget, register XtWidgetGeometry * intended, /* parent's changes; may be NULL */
- XtWidgetGeometry * reply) { /* child's preferred geometry; never NULL */
+XtGeometryResult XtQueryGeometry(Widget widget,
+ register XtWidgetGeometry *intended, /* parent's changes; may be NULL */
+ XtWidgetGeometry *reply) { /* child's preferred geometry; never NULL */
XtWidgetGeometry null_intended;
XtGeometryHandler query;
XtGeometryResult result;
diff --git a/src/GetActKey.c b/src/GetActKey.c
index d680bb6..7bfc2e0 100644
--- a/src/GetActKey.c
+++ b/src/GetActKey.c
@@ -74,7 +74,7 @@ in this Software without prior written authorization from The Open Group.
#include "IntrinsicI.h"
KeySym
-XtGetActionKeysym(XEvent *event, Modifiers * modifiers_return)
+XtGetActionKeysym(XEvent *event, Modifiers *modifiers_return)
{
TMKeyContext tm_context;
Modifiers modifiers;
diff --git a/src/GetResList.c b/src/GetResList.c
index e0ea277..f649de5 100644
--- a/src/GetResList.c
+++ b/src/GetResList.c
@@ -82,8 +82,8 @@ in this Software without prior written authorization from The Open Group.
void
XtGetResourceList(WidgetClass widget_class,
- XtResourceList * resources,
- Cardinal * num_resources)
+ XtResourceList *resources,
+ Cardinal *num_resources)
{
int size;
register Cardinal i, dest = 0;
@@ -119,7 +119,7 @@ XtGetResourceList(WidgetClass widget_class,
dlist[dest].resource_size = list[i]->resource_size;
/* trust that resource_offset isn't that big */
dlist[dest].resource_offset = (Cardinal)
- - ((int) (list[i]->resource_offset + 1));
+ -((int) (list[i]->resource_offset + 1));
dlist[dest].default_type = (String)
XrmQuarkToString(TOXRMQUARK(list[i]->default_type));
dlist[dest].default_addr = list[i]->default_addr;
@@ -142,8 +142,8 @@ ClassIsSubclassOf(WidgetClass class, WidgetClass superclass)
void
XtGetConstraintResourceList(WidgetClass widget_class,
- XtResourceList * resources,
- Cardinal * num_resources)
+ XtResourceList *resources,
+ Cardinal *num_resources)
{
int size;
register Cardinal i, dest = 0;
@@ -192,7 +192,7 @@ XtGetConstraintResourceList(WidgetClass widget_class,
dlist[dest].resource_size = list[i]->resource_size;
/* trust that resource_offset isn't that big */
dlist[dest].resource_offset = (Cardinal)
- - ((int) (list[i]->resource_offset + 1));
+ -((int) (list[i]->resource_offset + 1));
dlist[dest].default_type = (String)
XrmQuarkToString(TOXRMQUARK(list[i]->default_type));
dlist[dest].default_addr = list[i]->default_addr;
diff --git a/src/GetValues.c b/src/GetValues.c
index 74c3b8d..3e8bfa0 100644
--- a/src/GetValues.c
+++ b/src/GetValues.c
@@ -76,7 +76,7 @@ in this Software without prior written authorization from The Open Group.
static int
GetValues(char *base, /* Base address to fetch values from */
- XrmResourceList * res, /* The current resource values. */
+ XrmResourceList *res, /* The current resource values. */
register Cardinal num_resources, /* number of items in resources */
ArgList args, /* The resource values requested */
Cardinal num_args) /* number of items in arg list */
@@ -108,11 +108,10 @@ GetValues(char *base, /* Base address to fetch values from */
* mode in _XtCopyToArg. It helps performance, too...
*/
if ((*xrmres)->xrm_type == QCallback) {
- XtCallbackList callback = _XtGetCallbackList((InternalCallbackList *)
- (base -
- (*xrmres)->
- xrm_offset -
- 1));
+ XtCallbackList callback =
+ _XtGetCallbackList((InternalCallbackList *)
+ (base - (*xrmres)->xrm_offset - 1));
+
_XtCopyToArg((char *) &callback, &arg->value,
(*xrmres)->xrm_size);
}
diff --git a/src/HookObj.c b/src/HookObj.c
index e172be1..9216774 100644
--- a/src/HookObj.c
+++ b/src/HookObj.c
@@ -59,9 +59,9 @@ static XtResource resources[] = {
};
/* *INDENT-ON* */
-static void GetValuesHook(Widget widget, ArgList args, Cardinal * num_args);
+static void GetValuesHook(Widget widget, ArgList args, Cardinal *num_args);
static void Initialize(Widget req, Widget new, ArgList args,
- Cardinal * num_args);
+ Cardinal *num_args);
/* *INDENT-OFF* */
externaldef(hookobjclassrec) HookObjClassRec hookObjClassRec = {
@@ -106,7 +106,7 @@ externaldef(hookobjclassrec) HookObjClassRec hookObjClassRec = {
/* *INDENT-ON* */
externaldef(hookObjectClass)
-WidgetClass hookObjectClass = (WidgetClass) & hookObjClassRec;
+WidgetClass hookObjectClass = (WidgetClass) &hookObjClassRec;
static void
FreeShellList(Widget w,
@@ -123,7 +123,7 @@ static void
Initialize(Widget req _X_UNUSED,
Widget new,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
HookObject w = (HookObject) new;
@@ -134,7 +134,7 @@ Initialize(Widget req _X_UNUSED,
static void
GetValuesHook(Widget widget _X_UNUSED,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
/* get the XtNshells and XtNnumShells pseudo-resources */
}
diff --git a/src/Hooks.c b/src/Hooks.c
index d23720e..3af4751 100644
--- a/src/Hooks.c
+++ b/src/Hooks.c
@@ -57,7 +57,7 @@ XtAppAddBlockHook(XtAppContext app, XtBlockHookProc proc, XtPointer closure)
hook->closure = closure;
if (app->block_hook_list == NULL) {
_XtAddCallback(&app->destroy_callbacks,
- FreeBlockHookList, (XtPointer) & app->block_hook_list);
+ FreeBlockHookList, (XtPointer) &app->block_hook_list);
}
app->block_hook_list = hook;
UNLOCK_APP(app);
diff --git a/src/Initialize.c b/src/Initialize.c
index ca91b43..13c5b2f 100644
--- a/src/Initialize.c
+++ b/src/Initialize.c
@@ -652,7 +652,7 @@ _MergeOptionTables(const XrmOptionDescRec *src1,
const XrmOptionDescRec *src2,
Cardinal num_src2,
XrmOptionDescRec **dst,
- Cardinal * num_dst)
+ Cardinal *num_dst)
{
XrmOptionDescRec *table, *endP;
XrmOptionDescRec *opt1, *dstP;
@@ -765,10 +765,10 @@ XrmDatabase
_XtPreparseCommandLine(XrmOptionDescRec *urlist,
Cardinal num_urs,
int argc,
- _XtString * argv, /* return */
- String * applName,
- String * displayName,
- String * language)
+ _XtString *argv, /* return */
+ String *applName,
+ String *displayName,
+ String *language)
{
XrmDatabase db = NULL;
XrmOptionDescRec *options;
@@ -780,8 +780,7 @@ _XtPreparseCommandLine(XrmOptionDescRec *urlist,
_XtString *targv;
int targc = argc;
- targv =
- (_XtString *)
+ targv = (_XtString *)
__XtMalloc((Cardinal) (sizeof(_XtString *) * (size_t) argc));
(void) memmove(targv, argv, sizeof(char *) * (size_t) argc);
_MergeOptionTables(opTable, XtNumber(opTable), urlist, num_urs,
@@ -854,7 +853,7 @@ GetLanguage(Display *dpy, XtPerDisplay pd)
static void
ProcessInternalConnection(XtPointer client_data,
int *fd,
- XtInputId * id _X_UNUSED)
+ XtInputId *id _X_UNUSED)
{
XProcessInternalConnection((Display *) client_data, *fd);
}
@@ -876,7 +875,7 @@ ConnectionWatch(Display *dpy,
*watch_data = (XPointer) iptr;
}
else {
- iptr = (XtInputId *) * watch_data;
+ iptr = (XtInputId *) *watch_data;
XtRemoveInput(*iptr);
(void) XtFree(*watch_data);
}
@@ -931,7 +930,7 @@ _XtDisplayInitialize(Display *dpy,
}
value.size = sizeof(tmp_bool);
- value.addr = (XtPointer) & tmp_bool;
+ value.addr = (XtPointer) &tmp_bool;
if (_GetResource(dpy, search_list, "synchronous", "Synchronous",
XtRBoolean, &value)) {
int i;
@@ -953,20 +952,20 @@ _XtDisplayInitialize(Display *dpy,
}
value.size = sizeof(pd->multi_click_time);
- value.addr = (XtPointer) & pd->multi_click_time;
+ value.addr = (XtPointer) &pd->multi_click_time;
if (!_GetResource(dpy, search_list,
"multiClickTime", "MultiClickTime", XtRInt, &value)) {
pd->multi_click_time = 200;
}
value.size = sizeof(pd->appContext->selectionTimeout);
- value.addr = (XtPointer) & pd->appContext->selectionTimeout;
+ value.addr = (XtPointer) &pd->appContext->selectionTimeout;
(void) _GetResource(dpy, search_list,
"selectionTimeout", "SelectionTimeout", XtRInt, &value);
#ifndef NO_IDENTIFY_WINDOWS
value.size = sizeof(pd->appContext->identify_windows);
- value.addr = (XtPointer) & pd->appContext->identify_windows;
+ value.addr = (XtPointer) &pd->appContext->identify_windows;
(void) _GetResource(dpy, search_list,
"xtIdentifyWindows", "XtDebug", XtRBoolean, &value);
#endif
@@ -986,7 +985,7 @@ _XtDisplayInitialize(Display *dpy,
*/
void
-XtAppSetFallbackResources(XtAppContext app_context, String * specification_list)
+XtAppSetFallbackResources(XtAppContext app_context, String *specification_list)
{
LOCK_APP(app_context);
app_context->fallback_resources = specification_list;
@@ -994,13 +993,13 @@ XtAppSetFallbackResources(XtAppContext app_context, String * specification_list)
}
Widget
-XtOpenApplication(XtAppContext * app_context_return,
+XtOpenApplication(XtAppContext *app_context_return,
_Xconst char *application_class,
XrmOptionDescRec *options,
Cardinal num_options,
int *argc_in_out,
- _XtString * argv_in_out,
- String * fallback_resources,
+ _XtString *argv_in_out,
+ String *fallback_resources,
WidgetClass widget_class,
ArgList args_in,
Cardinal num_args_in)
@@ -1041,13 +1040,13 @@ XtOpenApplication(XtAppContext * app_context_return,
}
Widget
-XtAppInitialize(XtAppContext * app_context_return,
+XtAppInitialize(XtAppContext *app_context_return,
_Xconst char *application_class,
XrmOptionDescRec *options,
Cardinal num_options,
int *argc_in_out,
- _XtString * argv_in_out,
- String * fallback_resources,
+ _XtString *argv_in_out,
+ String *fallback_resources,
ArgList args_in,
Cardinal num_args_in)
{
@@ -1063,7 +1062,7 @@ XtInitialize(_Xconst _XtString name _X_UNUSED,
XrmOptionDescRec *options,
Cardinal num_options,
int *argc,
- _XtString * argv)
+ _XtString *argv)
{
Widget root;
XtAppContext app_con;
diff --git a/src/Intrinsic.c b/src/Intrinsic.c
index b64990d..07ccc78 100644
--- a/src/Intrinsic.c
+++ b/src/Intrinsic.c
@@ -171,7 +171,7 @@ XtGetClassExtension(WidgetClass object_class,
static void
ComputeWindowAttributes(Widget widget,
- XtValueMask * value_mask,
+ XtValueMask *value_mask,
XSetWindowAttributes *values)
{
XtExposeProc expose;
@@ -218,10 +218,10 @@ CallChangeManaged(register Widget widget)
register CompositePartPtr clPtr;
if (XtIsComposite(widget)) {
- cpPtr = (CompositePtr) & ((CompositeWidget) widget)->composite;
- clPtr = (CompositePartPtr) & ((CompositeWidgetClass)
- widget->core.widget_class)->
- composite_class;
+ cpPtr = (CompositePtr) &((CompositeWidget) widget)->composite;
+ clPtr = (CompositePartPtr) &((CompositeWidgetClass)
+ widget->core.
+ widget_class)->composite_class;
}
else
return;
@@ -247,7 +247,7 @@ CallChangeManaged(register Widget widget)
} /* CallChangeManaged */
static void
-MapChildren(CompositePart * cwp)
+MapChildren(CompositePart *cwp)
{
Cardinal i;
WidgetList children;
@@ -265,7 +265,7 @@ MapChildren(CompositePart * cwp)
} /* MapChildren */
static Boolean
-ShouldMapAllChildren(CompositePart * cwp)
+ShouldMapAllChildren(CompositePart *cwp)
{
Cardinal i;
WidgetList children;
@@ -327,7 +327,7 @@ RealizeWidget(Widget widget)
call_data.widget = widget;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
#ifndef NO_IDENTIFY_WINDOWS
if (_XtGetPerDisplay(display)->appContext->identify_windows) {
@@ -475,7 +475,7 @@ XtUnrealizeWidget(Widget widget)
call_data.widget = widget;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
UNLOCK_APP(app);
} /* XtUnrealizeWidget */
@@ -1602,7 +1602,7 @@ IsTattled(Widget widget)
{
GeoDataRec geo_data;
- XtGetSubresources(widget, (XtPointer) & geo_data,
+ XtGetSubresources(widget, (XtPointer) &geo_data,
(String) NULL, (String) NULL,
geo_resources, XtNumber(geo_resources), NULL, 0);
diff --git a/src/Keyboard.c b/src/Keyboard.c
index 6898fdf..da6fa11 100644
--- a/src/Keyboard.c
+++ b/src/Keyboard.c
@@ -101,7 +101,7 @@ _XtClearAncestorCache(Widget widget)
}
static XtServerGrabPtr
-CheckServerGrabs(XEvent *event, Widget * trace, Cardinal traceDepth)
+CheckServerGrabs(XEvent *event, Widget *trace, Cardinal traceDepth)
{
Cardinal i;
@@ -129,7 +129,7 @@ IsParent(Widget a, Widget b)
#define RelRtn(lca, type) {*relTypeRtn = type; return lca;}
static Widget
-CommonAncestor(register Widget a, register Widget b, XtGeneology * relTypeRtn)
+CommonAncestor(register Widget a, register Widget b, XtGeneology *relTypeRtn)
{
if (a == b) {
RelRtn(a, XtMySelf)
@@ -152,10 +152,10 @@ CommonAncestor(register Widget a, register Widget b, XtGeneology * relTypeRtn)
static Widget
_FindFocusWidget(Widget widget,
- Widget * trace,
+ Widget *trace,
int traceDepth,
Boolean activeCheck,
- Boolean * isTarget)
+ Boolean *isTarget)
{
int src;
Widget dst;
@@ -457,7 +457,7 @@ void
_XtHandleFocus(Widget widget,
XtPointer client_data, /* child who wants focus */
XEvent *event,
- Boolean * cont _X_UNUSED)
+ Boolean *cont _X_UNUSED)
{
XtPerDisplayInput pdi = _XtGetPerDisplayInput(XtDisplay(widget));
XtPerWidgetInput pwi = (XtPerWidgetInput) client_data;
@@ -662,7 +662,7 @@ static void
QueryEventMask(Widget widget, /* child who gets focus */
XtPointer client_data, /* ancestor giving it */
XEvent *event _X_UNUSED,
- Boolean * cont _X_UNUSED)
+ Boolean *cont _X_UNUSED)
{
/* widget was once the target of an XtSetKeyboardFocus but
* was unrealized at the time. Make sure ancestor still wants
@@ -799,7 +799,7 @@ XtSetKeyboardFocus(Widget widget, Widget descendant)
call_data.event_data = (XtPointer) descendant;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
UNLOCK_PROCESS;
UNLOCK_APP(app);
diff --git a/src/Manage.c b/src/Manage.c
index fe7c5e6..77f3d9f 100644
--- a/src/Manage.c
+++ b/src/Manage.c
@@ -82,7 +82,7 @@ static void
UnmanageChildren(WidgetList children,
Cardinal num_children,
Widget parent,
- Cardinal * num_unique_children,
+ Cardinal *num_unique_children,
Boolean call_change_managed,
_Xconst _XtString caller_func)
{
@@ -198,7 +198,7 @@ XtUnmanageChildren(WidgetList children, Cardinal num_children)
call_data.num_event_data = num_children;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
UNLOCK_APP(app);
} /* XtUnmanageChildren */
@@ -243,8 +243,7 @@ ManageChildren(WidgetList children,
unique_children = cache;
}
else {
- unique_children =
- (WidgetList)
+ unique_children = (WidgetList)
__XtMalloc((Cardinal) ((size_t) num_children * sizeof(Widget)));
}
num_unique_children = 0;
@@ -366,7 +365,7 @@ XtManageChildren(WidgetList children, Cardinal num_children)
call_data.num_event_data = num_children;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
UNLOCK_APP(app);
} /* XtManageChildren */
@@ -400,7 +399,7 @@ XtSetMappedWhenManaged(Widget widget, _XtBoolean mapped_when_managed)
call_data.event_data = (XtPointer) (unsigned long) mapped_when_managed;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
if (!XtIsManaged(widget)) {
@@ -496,7 +495,7 @@ XtChangeManagedSet(WidgetList unmanage_children,
call_data.num_event_data = num_unmanage;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
if (do_change_proc)
@@ -513,7 +512,7 @@ XtChangeManagedSet(WidgetList unmanage_children,
call_data.num_event_data = num_manage;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
UNLOCK_APP(app);
} /* XtChangeManagedSet */
diff --git a/src/NextEvent.c b/src/NextEvent.c
index 56983a8..6999c4f 100644
--- a/src/NextEvent.c
+++ b/src/NextEvent.c
@@ -373,8 +373,8 @@ IoWait(wait_times_ptr_t wt, wait_fds_ptr_t wf)
#ifdef USE_POLL
return poll(wf->fdlist, (nfds_t) wf->fdlistlen, wt->poll_wait);
#else
- return Select(wf->nfds, &wf->rmask, &wf->wmask, &wf->emask,
- wt->wait_time_ptr);
+ return Select (wf->nfds, &wf->rmask, &wf->wmask, &wf->emask,
+ wt->wait_time_ptr);
#endif
}
@@ -795,7 +795,7 @@ XtAddTimeOut(unsigned long interval,
}
static void
-QueueTimerEvent(XtAppContext app, TimerEventRec * ptr)
+QueueTimerEvent(XtAppContext app, TimerEventRec *ptr)
{
TimerEventRec *t, **tt;
@@ -826,8 +826,8 @@ XtAppAddTimeOut(XtAppContext app,
}
else
tptr = XtNew(TimerEventRec);
- UNLOCK_PROCESS;
+ UNLOCK_PROCESS;
tptr->te_next = NULL;
tptr->te_closure = closure;
tptr->te_proc = proc;
@@ -839,6 +839,7 @@ XtAppAddTimeOut(XtAppContext app,
ADD_TIME(tptr->te_timer_value, tptr->te_timer_value, current_time);
QueueTimerEvent(app, tptr);
UNLOCK_APP(app);
+
return ((XtIntervalId) tptr);
}
@@ -890,6 +891,7 @@ XtAppAddWorkProc(XtAppContext app, XtWorkProc proc, XtPointer closure)
}
else
wptr = XtNew(WorkProcRec);
+
UNLOCK_PROCESS;
wptr->next = app->workQueue;
wptr->closure = closure;
@@ -897,6 +899,7 @@ XtAppAddWorkProc(XtAppContext app, XtWorkProc proc, XtPointer closure)
wptr->app = app;
app->workQueue = wptr;
UNLOCK_APP(app);
+
return (XtWorkProcId) wptr;
}
@@ -946,6 +949,7 @@ XtAppAddSignal(XtAppContext app, XtSignalCallbackProc proc, XtPointer closure)
}
else
sptr = XtNew(SignalEventRec);
+
UNLOCK_PROCESS;
sptr->se_next = app->signalQueue;
sptr->se_closure = closure;
@@ -1049,6 +1053,7 @@ XtAppAddInput(XtAppContext app,
app->input_max = (short) n;
}
sptr = XtNew(InputEvent);
+
sptr->ie_proc = proc;
sptr->ie_closure = closure;
sptr->app = app;
diff --git a/src/Object.c b/src/Object.c
index bf23a29..843ff7d 100644
--- a/src/Object.c
+++ b/src/Object.c
@@ -126,7 +126,7 @@ externaldef(objectclassrec) ObjectClassRec objectClassRec = {
/* *INDENT-ON* */
externaldef(objectClass)
-WidgetClass objectClass = (WidgetClass) & objectClassRec;
+WidgetClass objectClass = (WidgetClass) &objectClassRec;
/*
* Start of object routines.
@@ -262,7 +262,7 @@ ObjectSetValues(Widget old,
Widget request _X_UNUSED,
Widget widget,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
CallbackTable offsets;
int i;
@@ -282,7 +282,7 @@ ObjectSetValues(Widget old,
if (*ol != NULL)
XtFree((char *) *ol);
if (*nl != NULL)
- *nl = _XtCompileCallbackList((XtCallbackList) * nl);
+ *nl = _XtCompileCallbackList((XtCallbackList) *nl);
}
}
UNLOCK_PROCESS;
diff --git a/src/PassivGrab.c b/src/PassivGrab.c
index e8bc80a..d380f5b 100644
--- a/src/PassivGrab.c
+++ b/src/PassivGrab.c
@@ -377,7 +377,7 @@ GrabMatchesSecond(register XtServerGrabPtr pFirstGrab,
*/
static void
-DeleteServerGrabFromList(XtServerGrabPtr * passiveListPtr,
+DeleteServerGrabFromList(XtServerGrabPtr *passiveListPtr,
XtServerGrabPtr pMinuendGrab)
{
register XtServerGrabPtr *next;
@@ -488,7 +488,7 @@ DeleteServerGrabFromList(XtServerGrabPtr * passiveListPtr,
}
static void
-DestroyPassiveList(XtServerGrabPtr * passiveListPtr)
+DestroyPassiveList(XtServerGrabPtr *passiveListPtr)
{
XtServerGrabPtr next, grab;
@@ -590,7 +590,7 @@ static void
ActiveHandler(Widget widget _X_UNUSED,
XtPointer pdi _X_UNUSED,
XEvent *event _X_UNUSED,
- Boolean * cont _X_UNUSED)
+ Boolean *cont _X_UNUSED)
{
/* nothing */
}
@@ -600,7 +600,7 @@ ActiveHandler(Widget widget _X_UNUSED,
*/
static void
MakeGrab(XtServerGrabPtr grab,
- XtServerGrabPtr * passiveListPtr,
+ XtServerGrabPtr *passiveListPtr,
Boolean isKeyboard,
XtPerDisplayInput pdi,
XtPerWidgetInput pwi)
@@ -640,7 +640,7 @@ MakeGrab(XtServerGrabPtr grab,
}
static void
-MakeGrabs(XtServerGrabPtr * passiveListPtr,
+MakeGrabs(XtServerGrabPtr *passiveListPtr,
Boolean isKeyboard,
XtPerDisplayInput pdi)
{
@@ -676,7 +676,7 @@ static void
RealizeHandler(Widget widget,
XtPointer closure,
XEvent *event _X_UNUSED,
- Boolean * cont _X_UNUSED)
+ Boolean *cont _X_UNUSED)
{
XtPerWidgetInput pwi = (XtPerWidgetInput) closure;
XtPerDisplayInput pdi;
diff --git a/src/Pointer.c b/src/Pointer.c
index 910db99..ad322c2 100644
--- a/src/Pointer.c
+++ b/src/Pointer.c
@@ -88,9 +88,8 @@ _XtProcessPointerEvent(XButtonEvent *event,
case ButtonRelease:
{
if ((device->grabType == XtPassiveServerGrab) &&
- !(event->
- state & (unsigned) (~(Button1Mask << (event->button - 1))) &
- AllButtonsMask))
+ !(event->state & (unsigned) (~(Button1Mask << (event->button - 1)))
+ & AllButtonsMask))
deactivateGrab = TRUE;
}
break;
diff --git a/src/Popup.c b/src/Popup.c
index 61be512..30b6ca6 100644
--- a/src/Popup.c
+++ b/src/Popup.c
@@ -65,7 +65,7 @@ _XtPopup(Widget widget, XtGrabKind grab_kind, _XtBoolean spring_loaded)
if (!shell_widget->shell.popped_up) {
XtGrabKind call_data = grab_kind;
- XtCallCallbacks(widget, XtNpopupCallback, (XtPointer) & call_data);
+ XtCallCallbacks(widget, XtNpopupCallback, (XtPointer) &call_data);
shell_widget->shell.popped_up = TRUE;
shell_widget->shell.grab_kind = grab_kind;
shell_widget->shell.spring_loaded = (Boolean) spring_loaded;
@@ -117,7 +117,7 @@ XtPopup(Widget widget, XtGrabKind grab_kind)
call_data.event_data = (XtPointer) grab_kind;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
} /* XtPopup */
@@ -136,7 +136,7 @@ XtPopupSpringLoaded(Widget widget)
call_data.widget = widget;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
}
@@ -166,7 +166,7 @@ XtPopdown(Widget widget)
if (grab_kind != XtGrabNone)
XtRemoveGrab(widget);
shell_widget->shell.popped_up = FALSE;
- XtCallCallbacks(widget, XtNpopdownCallback, (XtPointer) & grab_kind);
+ XtCallCallbacks(widget, XtNpopdownCallback, (XtPointer) &grab_kind);
hookobj = XtHooksOfDisplay(XtDisplay(widget));
if (XtHasCallbacks(hookobj, XtNchangeHook) == XtCallbackHasSome) {
@@ -176,7 +176,7 @@ XtPopdown(Widget widget)
call_data.widget = widget;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
} /* XtPopdown */
diff --git a/src/RectObj.c b/src/RectObj.c
index 29ef2ef..7a66402 100644
--- a/src/RectObj.c
+++ b/src/RectObj.c
@@ -126,7 +126,7 @@ externaldef(rectobjclassrec) RectObjClassRec rectObjClassRec = {
/* *INDENT-ON* */
externaldef(rectObjClass)
-WidgetClass rectObjClass = (WidgetClass) & rectObjClassRec;
+WidgetClass rectObjClass = (WidgetClass) &rectObjClassRec;
static void
XtCopyAncestorSensitive(Widget widget, int offset _X_UNUSED, XrmValue *value)
@@ -179,8 +179,8 @@ RectClassPartInitialize(register WidgetClass wc)
static void
RectSetValuesAlmost(Widget old _X_UNUSED,
Widget new _X_UNUSED,
- XtWidgetGeometry * request,
- XtWidgetGeometry * reply)
+ XtWidgetGeometry *request,
+ XtWidgetGeometry *reply)
{
*request = *reply;
}
diff --git a/src/ResConfig.c b/src/ResConfig.c
index c00d48e..a6a27e9 100644
--- a/src/ResConfig.c
+++ b/src/ResConfig.c
@@ -756,7 +756,7 @@ _search_widget_tree(Widget w, char *resource, char *value)
* ERRORS: none
*/
static int
-_locate_children(Widget parent, Widget ** children)
+_locate_children(Widget parent, Widget **children)
{
CompositeWidget comp = (CompositeWidget) parent;
Cardinal i;
diff --git a/src/Resources.c b/src/Resources.c
index 3f044c5..4512517 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -138,7 +138,7 @@ _XtCopyFromArg(XtArgVal src, char *dst, register unsigned int size)
} /* _XtCopyFromArg */
void
-_XtCopyToArg(char *src, XtArgVal * dst, register unsigned int size)
+_XtCopyToArg(char *src, XtArgVal *dst, register unsigned int size)
{
if (!*dst) {
#ifdef GETVALUES_BUG
@@ -189,7 +189,7 @@ _XtCopyToArg(char *src, XtArgVal * dst, register unsigned int size)
} /* _XtCopyToArg */
static void
-CopyToArg(char *src, XtArgVal * dst, register unsigned int size)
+CopyToArg(char *src, XtArgVal *dst, register unsigned int size)
{
if (!*dst) {
/* old GetValues semantics (storing directly into arglists) are bad,
@@ -352,15 +352,15 @@ BadSize(Cardinal size, XrmQuark name)
* create and XrmResourceList.
*/
void
-_XtDependencies(XtResourceList * class_resp, /* VAR */
- Cardinal * class_num_resp, /* VAR */
- XrmResourceList * super_res,
+_XtDependencies(XtResourceList *class_resp, /* VAR */
+ Cardinal *class_num_resp, /* VAR */
+ XrmResourceList *super_res,
Cardinal super_num_res,
Cardinal super_widget_size)
{
register XrmResourceList *new_res;
Cardinal new_num_res;
- XrmResourceList class_res = (XrmResourceList) * class_resp;
+ XrmResourceList class_res = (XrmResourceList) *class_resp;
Cardinal class_num_res = *class_num_resp;
register Cardinal i, j;
Cardinal new_next;
@@ -374,8 +374,7 @@ _XtDependencies(XtResourceList * class_resp, /* VAR */
/* Allocate and initialize new_res with superclass resource pointers */
new_num_res = super_num_res + class_num_res;
- new_res =
- (XrmResourceList *)
+ new_res = (XrmResourceList *)
__XtMalloc((Cardinal) (new_num_res * sizeof(XrmResourceList)));
if (super_num_res > 0)
XtMemmove(new_res, super_res, super_num_res * sizeof(XrmResourceList));
@@ -462,8 +461,7 @@ _XtCreateIndirectionTable(XtResourceList resources, Cardinal num_resources)
register Cardinal idx;
XrmResourceList *table;
- table =
- (XrmResourceList *)
+ table = (XrmResourceList *)
__XtMalloc((Cardinal) (num_resources * sizeof(XrmResourceList)));
for (idx = 0; idx < num_resources; idx++)
table[idx] = (XrmResourceList) (&(resources[idx]));
@@ -475,13 +473,13 @@ GetResources(Widget widget, /* Widget resources are associated with
char *base, /* Base address of memory to write to */
XrmNameList names, /* Full inheritance name of widget */
XrmClassList classes, /* Full inheritance class of widget */
- XrmResourceList * table, /* The list of resources required. */
+ XrmResourceList *table, /* The list of resources required. */
unsigned num_resources, /* number of items in resource list */
XrmQuarkList quark_args, /* Arg names quarkified */
ArgList args, /* ArgList to override resources */
unsigned num_args, /* number of items in arg list */
XtTypedArgList typed_args, /* Typed arg list to override resources */
- Cardinal * pNumTypedArgs, /* number of items in typed arg list */
+ Cardinal *pNumTypedArgs, /* number of items in typed arg list */
Boolean tm_hack) /* do baseTranslations */
{
/*
@@ -910,7 +908,7 @@ GetResources(Widget widget, /* Widget resources are associated with
else {
/* value.addr can be NULL see: !already_copied */
if (value.addr)
- *((XtTranslations *) & widget->core.tm.current_state) =
+ *((XtTranslations *) &widget->core.tm.current_state) =
*((XtTranslations *) value.addr);
}
}
@@ -926,6 +924,7 @@ GetResources(Widget widget, /* Widget resources are associated with
XtCacheRef *refs = (XtCacheRef *)
__XtMalloc((Cardinal)
(sizeof(XtCacheRef) * (size_t) (cache_ref_size + 1)));
+
(void) memmove(refs, cache_ref,
sizeof(XtCacheRef) * (size_t) cache_ref_size);
refs[cache_ref_size] = NULL;
@@ -976,7 +975,7 @@ _XtGetResources(register Widget w,
ArgList args,
Cardinal num_args,
XtTypedArgList typed_args,
- Cardinal * num_typed_args)
+ Cardinal *num_typed_args)
{
XrmName *names, names_s[50];
XrmClass *classes, classes_s[50];
diff --git a/src/Selection.c b/src/Selection.c
index b89654b..f5df019 100644
--- a/src/Selection.c
+++ b/src/Selection.c
@@ -278,12 +278,12 @@ FreeInfo(CallBackInfo info)
static CallBackInfo
MakeInfo(Select ctx,
- XtSelectionCallbackProc * callbacks,
- XtPointer * closures,
+ XtSelectionCallbackProc *callbacks,
+ XtPointer *closures,
int count,
Widget widget,
Time time,
- Boolean * incremental,
+ Boolean *incremental,
Atom *properties)
{
CallBackInfo info = XtNew(CallBackInfoRec);
@@ -294,8 +294,7 @@ MakeInfo(Select ctx,
((size_t) count * sizeof(XtSelectionCallbackProc)));
(void) memmove((char *) info->callbacks, (char *) callbacks,
(size_t) count * sizeof(XtSelectionCallbackProc));
- info->req_closure =
- (XtPointer *)
+ info->req_closure = (XtPointer *)
__XtMalloc((unsigned) ((size_t) count * sizeof(XtPointer)));
(void) memmove((char *) info->req_closure, (char *) closures,
(size_t) count * sizeof(XtPointer));
@@ -544,14 +543,14 @@ RemoveHandler(Request req,
}
static void
-OwnerTimedOut(XtPointer closure, XtIntervalId * id _X_UNUSED)
+OwnerTimedOut(XtPointer closure, XtIntervalId *id _X_UNUSED)
{
Request req = (Request) closure;
Select ctx = req->ctx;
if (ctx->incremental && (ctx->owner_cancel != NULL)) {
(*ctx->owner_cancel) (ctx->widget, &ctx->selection,
- &req->target, (XtRequestId *) & req,
+ &req->target, (XtRequestId *) &req,
ctx->owner_closure);
}
else {
@@ -564,7 +563,7 @@ OwnerTimedOut(XtPointer closure, XtIntervalId * id _X_UNUSED)
if (ctx->incremental)
(*(XtSelectionDoneIncrProc) ctx->notify)
(ctx->widget, &ctx->selection, &req->target,
- (XtRequestId *) & req, ctx->owner_closure);
+ (XtRequestId *) &req, ctx->owner_closure);
else
(*ctx->notify) (ctx->widget, &ctx->selection, &req->target);
}
@@ -615,7 +614,7 @@ static void
HandlePropertyGone(Widget widget _X_UNUSED,
XtPointer closure,
XEvent *ev,
- Boolean * cont _X_UNUSED)
+ Boolean *cont _X_UNUSED)
{
XPropertyEvent *event = (XPropertyEvent *) ev;
Request req = (Request) closure;
@@ -633,7 +632,7 @@ HandlePropertyGone(Widget widget _X_UNUSED,
if (ctx->incremental) {
(*(XtSelectionDoneIncrProc) ctx->notify)
(ctx->widget, &ctx->selection, &req->target,
- (XtRequestId *) & req, ctx->owner_closure);
+ (XtRequestId *) &req, ctx->owner_closure);
}
else
(*ctx->notify) (ctx->widget, &ctx->selection, &req->target);
@@ -656,7 +655,7 @@ HandlePropertyGone(Widget widget _X_UNUSED,
(ctx->widget, &ctx->selection, &req->target,
&req->type, &req->value,
&req->bytelength, &req->format,
- &size, ctx->owner_closure, (XtPointer *) & req);
+ &size, ctx->owner_closure, (XtPointer *) &req);
if (req->bytelength)
req->bytelength = BYTELENGTH(req->bytelength, req->format);
req->offset = 0;
@@ -750,7 +749,7 @@ GetConversion(Select ctx, /* logical owner */
if ((*(XtConvertSelectionIncrProc) ctx->convert)
(ctx->widget, &event->selection, &target,
&targetType, &value, &length, &format,
- &size, ctx->owner_closure, (XtRequestId *) & req)
+ &size, ctx->owner_closure, (XtRequestId *) &req)
== FALSE) {
XtFree((char *) req);
ctx->ref_count--;
@@ -814,7 +813,7 @@ static void
HandleSelectionEvents(Widget widget,
XtPointer closure,
XEvent *event,
- Boolean * cont _X_UNUSED)
+ Boolean *cont _X_UNUSED)
{
Select ctx;
XSelectionEvent ev;
@@ -1090,7 +1089,7 @@ static void
ReqCleanup(Widget widget,
XtPointer closure,
XEvent *ev,
- Boolean * cont _X_UNUSED)
+ Boolean *cont _X_UNUSED)
{
CallBackInfo info = (CallBackInfo) closure;
unsigned long bytesafter, length;
@@ -1140,7 +1139,7 @@ ReqCleanup(Widget widget,
}
static void
-ReqTimedOut(XtPointer closure, XtIntervalId * id _X_UNUSED)
+ReqTimedOut(XtPointer closure, XtIntervalId *id _X_UNUSED)
{
XtPointer value = NULL;
unsigned long length = 0;
@@ -1195,7 +1194,7 @@ static void
HandleGetIncrement(Widget widget,
XtPointer closure,
XEvent *ev,
- Boolean * cont _X_UNUSED)
+ Boolean *cont _X_UNUSED)
{
XPropertyEvent *event = (XPropertyEvent *) ev;
CallBackInfo info = (CallBackInfo) closure;
@@ -1410,7 +1409,7 @@ static void
HandleSelectionReplies(Widget widget,
XtPointer closure,
XEvent *ev,
- Boolean * cont _X_UNUSED)
+ Boolean *cont _X_UNUSED)
{
XSelectionEvent *event = (XSelectionEvent *) ev;
Display *dpy = event->display;
@@ -1502,7 +1501,7 @@ DoLocalTransfer(Request req,
if (!(*(XtConvertSelectionIncrProc) ctx->convert)
(ctx->widget, &selection, &target,
&resulttype, &value, &length, &format,
- &size, ctx->owner_closure, (XtRequestId *) & req)) {
+ &size, ctx->owner_closure, (XtRequestId *) &req)) {
HandleNone(widget, callback, closure, selection);
}
else {
@@ -1532,7 +1531,7 @@ DoLocalTransfer(Request req,
(*(XtConvertSelectionIncrProc) ctx->convert)
(ctx->widget, &selection, &target,
&resulttype, &value, &length, &format,
- &size, ctx->owner_closure, (XtRequestId *) & req);
+ &size, ctx->owner_closure, (XtRequestId *) &req);
}
else
allSent = TRUE;
@@ -1551,7 +1550,7 @@ DoLocalTransfer(Request req,
(*(XtConvertSelectionIncrProc) ctx->convert)
(ctx->widget, &selection, &target,
&resulttype, &value, &length, &format,
- &size, ctx->owner_closure, (XtRequestId *) & req);
+ &size, ctx->owner_closure, (XtRequestId *) &req);
}
if (total == NULL)
total = __XtMalloc(1);
@@ -1562,7 +1561,7 @@ DoLocalTransfer(Request req,
if (ctx->notify)
(*(XtSelectionDoneIncrProc) ctx->notify)
(ctx->widget, &selection, &target,
- (XtRequestId *) & req, ctx->owner_closure);
+ (XtRequestId *) &req, ctx->owner_closure);
else
XtFree((char *) value);
}
@@ -1694,11 +1693,11 @@ GetSelectionValues(Widget widget,
Atom selection,
Atom *targets,
int count,
- XtSelectionCallbackProc * callbacks,
+ XtSelectionCallbackProc *callbacks,
int num_callbacks,
- XtPointer * closures,
+ XtPointer *closures,
Time time,
- Boolean * incremental,
+ Boolean *incremental,
Atom *properties)
{
Select ctx;
@@ -1754,14 +1753,12 @@ GetSelectionValues(Widget widget,
time, incremental, properties);
XtStackFree((XtPointer) passed_callbacks, stack_cbs);
- info->target =
- (Atom *)
+ info->target = (Atom *)
__XtMalloc((unsigned) ((size_t) (count + 1) * sizeof(Atom)));
(*info->target) = ctx->prop_list->indirect_atom;
(void) memmove((char *) info->target + sizeof(Atom), (char *) targets,
(size_t) count * sizeof(Atom));
- pairs =
- (IndirectPair *)
+ pairs = (IndirectPair *)
__XtMalloc((unsigned) ((size_t) count * sizeof(IndirectPair)));
for (p = &pairs[count - 1], t = &targets[count - 1], i = count - 1;
p >= pairs; p--, t--, i--) {
@@ -1790,7 +1787,7 @@ XtGetSelectionValues(Widget widget,
Atom *targets,
int count,
XtSelectionCallbackProc callback,
- XtPointer * closures,
+ XtPointer *closures,
Time time)
{
Boolean incremental_values[32];
@@ -1822,7 +1819,7 @@ XtGetSelectionValuesIncremental(Widget widget,
Atom *targets,
int count,
XtSelectionCallbackProc callback,
- XtPointer * closures,
+ XtPointer *closures,
Time time)
{
Boolean incremental_values[32];
@@ -1937,10 +1934,10 @@ AddSelectionRequests(Widget wid,
Atom sel,
int count,
Atom *targets,
- XtSelectionCallbackProc * callbacks,
+ XtSelectionCallbackProc *callbacks,
int num_cb,
- XtPointer * closures,
- Boolean * incrementals,
+ XtPointer *closures,
+ Boolean *incrementals,
Atom *properties)
{
QueuedRequestInfo qi;
@@ -2257,7 +2254,7 @@ XtGetSelectionParameters(Widget owner,
Atom selection,
XtRequestId request_id,
Atom *type_return,
- XtPointer * value_return,
+ XtPointer *value_return,
unsigned long *length_return,
int *format_return)
{
diff --git a/src/SetValues.c b/src/SetValues.c
index 87b33e5..a50faab 100644
--- a/src/SetValues.c
+++ b/src/SetValues.c
@@ -79,7 +79,7 @@ in this Software without prior written authorization from The Open Group.
static void
SetValues(char *base, /* Base address to write values to */
- XrmResourceList * res, /* The current resource values. */
+ XrmResourceList *res, /* The current resource values. */
register Cardinal num_resources, /* number of items in resources */
ArgList args, /* The resource values to set */
Cardinal num_args) /* number of items in arg list */
@@ -288,10 +288,10 @@ XtSetValues(register Widget w, ArgList args, Cardinal num_args)
set_val.num_args = num_args;
call_data.type = XtHsetValues;
call_data.widget = w;
- call_data.event_data = (XtPointer) & set_val;
+ call_data.event_data = (XtPointer) &set_val;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
if (XtIsRectObj(w)) {
@@ -371,7 +371,7 @@ XtSetValues(register Widget w, ArgList args, Cardinal num_args)
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.
geometryhook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
call_data.result = result =
_XtMakeGeometryRequest(w, &geoReq, &geoReply,
&cleared_rect_obj);
@@ -380,7 +380,7 @@ XtSetValues(register Widget w, ArgList args, Cardinal num_args)
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.
geometryhook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
else {
result = _XtMakeGeometryRequest(w, &geoReq, &geoReply,
diff --git a/src/SetWMCW.c b/src/SetWMCW.c
index 3394c02..5ea0efc 100644
--- a/src/SetWMCW.c
+++ b/src/SetWMCW.c
@@ -76,7 +76,7 @@ in this Software without prior written authorization from The Open Group.
*/
void
-XtSetWMColormapWindows(Widget widget, Widget * list, Cardinal count)
+XtSetWMColormapWindows(Widget widget, Widget *list, Cardinal count)
{
Window *data;
Widget *checked, *top, *temp, hookobj;
@@ -158,7 +158,7 @@ XtSetWMColormapWindows(Widget widget, Widget * list, Cardinal count)
call_data.num_event_data = count;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
XtFree((char *) data);
diff --git a/src/Shell.c b/src/Shell.c
index f649e1c..07713cc 100644
--- a/src/Shell.c
+++ b/src/Shell.c
@@ -167,8 +167,8 @@ static void ChangeManaged(Widget);
static XtGeometryResult GeometryManager(Widget, XtWidgetGeometry *,
XtWidgetGeometry *);
static XtGeometryResult RootGeometryManager(Widget gw,
- XtWidgetGeometry * request,
- XtWidgetGeometry * reply);
+ XtWidgetGeometry *request,
+ XtWidgetGeometry *reply);
static void Destroy(Widget);
/* *INDENT-OFF* */
@@ -966,7 +966,7 @@ ClassPartInitialize(WidgetClass widget_class)
}
static void EventHandler(Widget wid, XtPointer closure, XEvent *event,
- Boolean * continue_to_dispatch);
+ Boolean *continue_to_dispatch);
static void _popup_set_prop(ShellWidget);
static void
@@ -1027,7 +1027,7 @@ static void
Initialize(Widget req _X_UNUSED,
Widget new,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
ShellWidget w = (ShellWidget) new;
@@ -1058,7 +1058,7 @@ static void
WMInitialize(Widget req _X_UNUSED,
Widget new,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
WMShellWidget w = (WMShellWidget) new;
TopLevelShellWidget tls = (TopLevelShellWidget) new; /* maybe */
@@ -1086,7 +1086,7 @@ static void
TopLevelInitialize(Widget req _X_UNUSED,
Widget new,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
TopLevelShellWidget w = (TopLevelShellWidget) new;
@@ -1109,7 +1109,7 @@ static void
ApplicationInitialize(Widget req _X_UNUSED,
Widget new,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
ApplicationShellWidget w = (ApplicationShellWidget) new;
@@ -1157,7 +1157,7 @@ static void
SessionInitialize(Widget req _X_UNUSED,
Widget new,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
#ifndef XT_NO_SM
SessionShellWidget w = (SessionShellWidget) new;
@@ -1595,7 +1595,7 @@ static void
EventHandler(Widget wid,
XtPointer closure _X_UNUSED,
XEvent *event,
- Boolean * continue_to_dispatch _X_UNUSED)
+ Boolean *continue_to_dispatch _X_UNUSED)
{
register ShellWidget w = (ShellWidget) wid;
WMShellWidget wmshell = (WMShellWidget) w;
@@ -1904,8 +1904,8 @@ ChangeManaged(Widget wid)
static XtGeometryResult
GeometryManager(Widget wid,
- XtWidgetGeometry * request,
- XtWidgetGeometry * reply _X_UNUSED)
+ XtWidgetGeometry *request,
+ XtWidgetGeometry *reply _X_UNUSED)
{
ShellWidget shell = (ShellWidget) (wid->core.parent);
XtWidgetGeometry my_request;
@@ -2032,8 +2032,8 @@ _wait_for_response(ShellWidget w, XEvent *event, unsigned long request_num)
static XtGeometryResult
RootGeometryManager(Widget gw,
- XtWidgetGeometry * request,
- XtWidgetGeometry * reply _X_UNUSED)
+ XtWidgetGeometry *request,
+ XtWidgetGeometry *reply _X_UNUSED)
{
register ShellWidget w = (ShellWidget) gw;
XWindowChanges values;
@@ -2308,7 +2308,7 @@ SetValues(Widget old,
Widget ref _X_UNUSED,
Widget new,
ArgList args,
- Cardinal * num_args)
+ Cardinal *num_args)
{
ShellWidget nw = (ShellWidget) new;
ShellWidget ow = (ShellWidget) old;
@@ -2354,7 +2354,7 @@ WMSetValues(Widget old,
Widget ref _X_UNUSED,
Widget new,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
WMShellWidget nwmshell = (WMShellWidget) new;
WMShellWidget owmshell = (WMShellWidget) old;
@@ -2475,7 +2475,7 @@ TransientSetValues(Widget oldW,
Widget refW _X_UNUSED,
Widget newW,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
TransientShellWidget old = (TransientShellWidget) oldW;
TransientShellWidget new = (TransientShellWidget) newW;
@@ -2497,7 +2497,7 @@ TopLevelSetValues(Widget oldW,
Widget refW _X_UNUSED,
Widget newW,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
TopLevelShellWidget old = (TopLevelShellWidget) oldW;
TopLevelShellWidget new = (TopLevelShellWidget) newW;
@@ -2565,7 +2565,7 @@ TopLevelSetValues(Widget oldW,
/* do not assume it's terminated by a NULL element */
static _XtString *
-NewArgv(int count, _XtString * str)
+NewArgv(int count, _XtString *str)
{
Cardinal nbytes = 0;
Cardinal num = 0;
@@ -2601,7 +2601,7 @@ ApplicationSetValues(Widget current,
Widget request _X_UNUSED,
Widget new,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
ApplicationShellWidget nw = (ApplicationShellWidget) new;
ApplicationShellWidget cw = (ApplicationShellWidget) current;
@@ -2631,7 +2631,7 @@ SessionSetValues(Widget current,
Widget request _X_UNUSED,
Widget new,
ArgList args _X_UNUSED,
- Cardinal * num_args _X_UNUSED)
+ Cardinal *num_args _X_UNUSED)
{
#ifndef XT_NO_SM
SessionShellWidget nw = (SessionShellWidget) new;
@@ -2774,7 +2774,7 @@ SessionSetValues(Widget current,
}
void
-_XtShellGetCoordinates(Widget widget, Position * x, Position * y)
+_XtShellGetCoordinates(Widget widget, Position *x, Position *y)
{
ShellWidget w = (ShellWidget) widget;
@@ -2797,7 +2797,7 @@ _XtShellGetCoordinates(Widget widget, Position * x, Position * y)
}
static void
-GetValuesHook(Widget widget, ArgList args, Cardinal * num_args)
+GetValuesHook(Widget widget, ArgList args, Cardinal *num_args)
{
ShellWidget w = (ShellWidget) widget;
@@ -2953,7 +2953,7 @@ JoinSession(SessionShellWidget w)
#endif /* !XT_NO_SM */
static _XtString *
-NewStringArray(_XtString * str)
+NewStringArray(_XtString *str)
{
Cardinal nbytes = 0;
Cardinal num = 0;
@@ -2985,7 +2985,7 @@ NewStringArray(_XtString * str)
}
static void
-FreeStringArray(_XtString * str)
+FreeStringArray(_XtString *str)
{
if (str)
XtFree((_XtString) str);
@@ -3155,7 +3155,7 @@ SetSessionProperties(SessionShellWidget w,
static void
GetIceEvent(XtPointer client_data,
int *source _X_UNUSED,
- XtInputId * id _X_UNUSED)
+ XtInputId *id _X_UNUSED)
{
SessionShellWidget w = (SessionShellWidget) client_data;
IceProcessMessagesStatus status;
@@ -3225,7 +3225,7 @@ XtCallSaveCallbacks(SmcConn connection _X_UNUSED,
save->save_success = True;
save->save_tokens = save->interact_tokens = 0;
- prev = (XtSaveYourself) & w->session.save;
+ prev = (XtSaveYourself) &w->session.save;
while (prev->next)
prev = prev->next;
prev->next = save;
@@ -3453,7 +3453,7 @@ XtSessionReturnToken(XtCheckpointToken token)
}
static Boolean
-IsInArray(String str, _XtString * sarray)
+IsInArray(String str, _XtString *sarray)
{
if (str == NULL || sarray == NULL)
return False;
@@ -3466,8 +3466,8 @@ IsInArray(String str, _XtString * sarray)
static _XtString *
EditCommand(_XtString str, /* if not NULL, the sm_client_id */
- _XtString * src1, /* first choice */
- _XtString * src2) /* alternate */
+ _XtString *src1, /* first choice */
+ _XtString *src2) /* alternate */
{
Boolean have;
Boolean want;
diff --git a/src/TMaction.c b/src/TMaction.c
index 8b0b750..21e4c35 100644
--- a/src/TMaction.c
+++ b/src/TMaction.c
@@ -242,10 +242,10 @@ SearchActionTable(XrmQuark signature,
static int
BindActions(TMSimpleStateTree stateTree,
- XtActionProc * procs,
+ XtActionProc *procs,
CompiledActionTable compiledActionTable,
TMShortCard numActions,
- Cardinal * ndxP)
+ Cardinal *ndxP)
{
register int unbound = (int) (stateTree->numQuarks - *ndxP);
CompiledAction *action;
@@ -310,7 +310,7 @@ typedef struct _TMClassCacheRec {
static int
BindProcs(Widget widget,
TMSimpleStateTree stateTree,
- XtActionProc * procs,
+ XtActionProc *procs,
TMBindCacheStatus bindStatus)
{
register WidgetClass class;
@@ -405,7 +405,7 @@ TryBindCache(Widget widget, TMStateTree stateTree)
* after this call is made out of coreClassPartInit.
*/
XtPointer
-_XtInitializeActionData(register struct _XtActionsRec * actions,
+_XtInitializeActionData(register struct _XtActionsRec *actions,
register Cardinal count,
_XtBoolean inPlace)
{
@@ -423,7 +423,7 @@ _XtInitializeActionData(register struct _XtActionsRec * actions,
static XtActionProc *
EnterBindCache(Widget w,
TMSimpleStateTree stateTree,
- XtActionProc * procs,
+ XtActionProc *procs,
TMBindCacheStatus bindStatus)
{
TMClassCache classCache;
@@ -471,7 +471,7 @@ EnterBindCache(Widget w,
}
_XtGlobalTM.bindCacheTbl[_XtGlobalTM.numBindCache++] = bindCache;
#endif /* TRACE_TM */
- XtMemmove((XtPointer) & bindCache->procs[0],
+ XtMemmove((XtPointer) &bindCache->procs[0],
(XtPointer) procs, procsSize);
}
UNLOCK_PROCESS;
@@ -479,7 +479,7 @@ EnterBindCache(Widget w,
}
static void
-RemoveFromBindCache(Widget w, XtActionProc * procs)
+RemoveFromBindCache(Widget w, XtActionProc *procs)
{
TMClassCache classCache;
TMBindCache *bindCachePtr;
@@ -488,7 +488,7 @@ RemoveFromBindCache(Widget w, XtActionProc * procs)
LOCK_PROCESS;
classCache = GetClassCache(w);
- bindCachePtr = (TMBindCache *) & classCache->bindCache;
+ bindCachePtr = (TMBindCache *) &classCache->bindCache;
for (bindCache = *bindCachePtr;
*bindCachePtr;
@@ -595,11 +595,11 @@ _XtBindActions(Widget widget, XtTM tm)
if (bindWidget->core.destroy_callbacks != NULL)
_XtAddCallbackOnce((InternalCallbackList *)
- & bindWidget->core.destroy_callbacks,
+ &bindWidget->core.destroy_callbacks,
RemoveAccelerators, (XtPointer) widget);
else
_XtAddCallback((InternalCallbackList *)
- & bindWidget->core.destroy_callbacks,
+ &bindWidget->core.destroy_callbacks,
RemoveAccelerators, (XtPointer) widget);
}
else
@@ -694,7 +694,7 @@ void
_XtRemoveBindProcsByIndex(Widget w, TMBindData bindData, TMShortCard ndx)
{
TMShortCard i = ndx;
- TMBindProcs bindProcs = (TMBindProcs) & bindData->bindTbl[0];
+ TMBindProcs bindProcs = (TMBindProcs) &bindData->bindTbl[0];
RemoveFromBindCache(bindProcs->widget ? bindProcs->widget : w,
bindProcs[i].procs);
@@ -742,8 +742,8 @@ XtAppAddActions(XtAppContext app, XtActionList actions, Cardinal num_actions)
void
XtGetActionList(WidgetClass widget_class,
- XtActionList * actions_return,
- Cardinal * num_actions_return)
+ XtActionList *actions_return,
+ Cardinal *num_actions_return)
{
CompiledActionTable table;
@@ -763,7 +763,7 @@ XtGetActionList(WidgetClass widget_class,
if (*num_actions_return) {
XtActionList list = *actions_return = (XtActionList)
__XtMalloc((Cardinal)
- ((size_t) * num_actions_return * sizeof(XtActionsRec)));
+ ((size_t) *num_actions_return * sizeof(XtActionsRec)));
table = GetClassActions(widget_class);
@@ -805,8 +805,8 @@ _XtFindPopup(Widget widget, String name)
void
XtMenuPopupAction(Widget widget,
XEvent *event,
- String * params,
- Cardinal * num_params)
+ String *params,
+ Cardinal *num_params)
{
Boolean spring_loaded;
register Widget popup_shell;
@@ -856,8 +856,8 @@ XtMenuPopupAction(Widget widget,
static void
_XtMenuPopdownAction(Widget widget,
XEvent *event _X_UNUSED,
- String * params,
- Cardinal * num_params)
+ String *params,
+ Cardinal *num_params)
{
Widget popup_shell;
@@ -930,7 +930,7 @@ void
XtCallActionProc(Widget widget,
_Xconst char *action,
XEvent *event,
- String * params,
+ String *params,
Cardinal num_params)
{
CompiledAction *actionP;
diff --git a/src/TMgrab.c b/src/TMgrab.c
index 70650a0..352d2ee 100644
--- a/src/TMgrab.c
+++ b/src/TMgrab.c
@@ -170,6 +170,7 @@ typedef struct {
static Boolean
DoGrab(StatePtr state, XtPointer data)
{
+ /* *INDENT-EQLS* */
DoGrabRec *doGrabP = (DoGrabRec *) data;
GrabActionRec *grabP = doGrabP->grabP;
Widget widget = doGrabP->widget;
@@ -279,8 +280,8 @@ _XtRegisterGrabs(Widget widget)
doGrab.widget = widget;
doGrab.grabP = grabP;
doGrab.count = (TMShortCard) count;
- _XtTraverseStateTree((TMStateTree) * stateTreePtr,
- DoGrab, (XtPointer) & doGrab);
+ _XtTraverseStateTree((TMStateTree) *stateTreePtr,
+ DoGrab, (XtPointer) &doGrab);
}
}
UNLOCK_PROCESS;
diff --git a/src/TMkey.c b/src/TMkey.c
index fc74ef6..b747f07 100644
--- a/src/TMkey.c
+++ b/src/TMkey.c
@@ -172,8 +172,8 @@ FM(0x1e), FM(0x9e), FM(0x5e), FM(0xde), FM(0x3e), FM(0xbe), FM(0x7e), FM(0xfe)
Boolean
_XtComputeLateBindings(Display *dpy,
LateBindingsPtr lateModifiers,
- Modifiers * computed,
- Modifiers * computedMask)
+ Modifiers *computed,
+ Modifiers *computedMask)
{
int i, j, ref;
ModToKeysymTable *temp;
@@ -354,8 +354,8 @@ _XtMatchUsingDontCareMods(TMTypeMatch typeMatch,
void
XtConvertCase(Display *dpy,
KeySym keysym,
- KeySym * lower_return,
- KeySym * upper_return)
+ KeySym *lower_return,
+ KeySym *upper_return)
{
XtPerDisplay pd;
CaseConverterPtr ptr;
@@ -532,8 +532,8 @@ void
XtTranslateKeycode(Display *dpy,
_XtKeyCode keycode,
Modifiers modifiers,
- Modifiers * modifiers_return,
- KeySym * keysym_return)
+ Modifiers *modifiers_return,
+ KeySym *keysym_return)
{
XtPerDisplay pd;
@@ -552,8 +552,8 @@ void
XtTranslateKey(register Display *dpy,
_XtKeyCode keycode,
Modifiers modifiers,
- Modifiers * modifiers_return,
- KeySym * keysym_return)
+ Modifiers *modifiers_return,
+ KeySym *keysym_return)
{
#ifndef XKB
XtPerDisplay pd;
@@ -694,7 +694,7 @@ void
XtKeysymToKeycodeList(Display *dpy,
KeySym keysym,
KeyCode **keycodes_return,
- Cardinal * keycount_return)
+ Cardinal *keycount_return)
{
XtPerDisplay pd;
unsigned keycode;
diff --git a/src/TMparse.c b/src/TMparse.c
index 02642bc..62f2940 100644
--- a/src/TMparse.c
+++ b/src/TMparse.c
@@ -497,7 +497,7 @@ Syntax(_Xconst char *str0, _Xconst char *str1)
}
static Cardinal
-LookupTMEventType(String eventStr, Boolean * error)
+LookupTMEventType(String eventStr, Boolean *error)
{
register int i = 0, left, right;
register XrmQuark signature;
@@ -535,7 +535,7 @@ StoreLateBindings(KeySym keysymL,
Boolean notL,
KeySym keysymR,
Boolean notR,
- LateBindingsPtr * lateBindings)
+ LateBindingsPtr *lateBindings)
{
LateBindingsPtr temp;
@@ -585,10 +585,10 @@ StoreLateBindings(KeySym keysymL,
static void
_XtParseKeysymMod(String name,
- LateBindingsPtr * lateBindings,
+ LateBindingsPtr *lateBindings,
Boolean notFlag,
- Value * valueP,
- Boolean * error)
+ Value *valueP,
+ Boolean *error)
{
KeySym keySym;
@@ -601,9 +601,9 @@ _XtParseKeysymMod(String name,
static Boolean
_XtLookupModifier(XrmQuark signature,
- LateBindingsPtr * lateBindings,
+ LateBindingsPtr *lateBindings,
Boolean notFlag,
- Value * valueP,
+ Value *valueP,
Bool constMask)
{
int left, right;
@@ -691,7 +691,7 @@ FetchModifierToken(String str, XrmQuark *token_return)
}
static String
-ParseModifiers(register String str, EventPtr event, Boolean * error)
+ParseModifiers(register String str, EventPtr event, Boolean *error)
{
register String start;
Boolean notFlag, exclusive, keysymAsMod;
@@ -781,8 +781,8 @@ ParseModifiers(register String str, EventPtr event, Boolean * error)
static String
ParseXtEventType(register String str,
EventPtr event,
- Cardinal * tmEventP,
- Boolean * error)
+ Cardinal *tmEventP,
+ Boolean *error)
{
String start = str;
char eventTypeStrbuf[100];
@@ -866,7 +866,7 @@ StrToNum(String str)
}
static KeySym
-StringToKeySym(String str, Boolean * error)
+StringToKeySym(String str, Boolean *error)
{
KeySym k;
@@ -902,8 +902,9 @@ StringToKeySym(String str, Boolean * error)
static void
ParseModImmed(Value value,
- LateBindingsPtr * lateBindings _X_UNUSED,
- Boolean notFlag _X_UNUSED, Value * valueP)
+ LateBindingsPtr *lateBindings _X_UNUSED,
+ Boolean notFlag _X_UNUSED,
+ Value *valueP)
{
*valueP = value;
}
@@ -913,7 +914,7 @@ ParseModImmed(Value value,
*/
static void
ParseModSym(Value value,
- LateBindingsPtr * lateBindings, Boolean notFlag, Value * valueP)
+ LateBindingsPtr *lateBindings, Boolean notFlag, Value *valueP)
{
register KeySym keysymL = (KeySym) value;
register KeySym keysymR = keysymL + 1; /* valid for supported keysyms */
@@ -939,7 +940,7 @@ static String
ParseImmed(register String str,
register Opaque closure,
register EventPtr event,
- Boolean * error _X_UNUSED)
+ Boolean *error _X_UNUSED)
{
event->event.eventCode = (unsigned long) closure;
event->event.eventCodeMask = (unsigned long) (~0UL);
@@ -951,7 +952,7 @@ static String
ParseAddModifier(register String str,
register Opaque closure,
register EventPtr event,
- Boolean * error _X_UNUSED)
+ Boolean *error _X_UNUSED)
{
register unsigned long modval = (unsigned long) closure;
@@ -966,7 +967,7 @@ static String
ParseKeyAndModifiers(String str,
Opaque closure,
EventPtr event,
- Boolean * error)
+ Boolean *error)
{
str = ParseKeySym(str, closure, event, error);
if ((unsigned long) closure == 0) {
@@ -986,7 +987,7 @@ static String
ParseKeySym(register String str,
Opaque closure _X_UNUSED,
EventPtr event,
- Boolean * error)
+ Boolean *error)
{
String start;
char keySymNamebuf[100];
@@ -1050,7 +1051,7 @@ ParseKeySym(register String str,
}
static String
-ParseTable(register String str, Opaque closure, EventPtr event, Boolean * error)
+ParseTable(register String str, Opaque closure, EventPtr event, Boolean *error)
{
register String start = str;
register XrmQuark signature;
@@ -1087,7 +1088,7 @@ static String
ParseNone(String str,
Opaque closure _X_UNUSED,
EventPtr event,
- Boolean * error _X_UNUSED)
+ Boolean *error _X_UNUSED)
{
event->event.eventCode = 0;
event->event.eventCodeMask = 0;
@@ -1096,7 +1097,7 @@ ParseNone(String str,
}
static String
-ParseAtom(String str, Opaque closure _X_UNUSED, EventPtr event, Boolean * error)
+ParseAtom(String str, Opaque closure _X_UNUSED, EventPtr event, Boolean *error)
{
ScanWhitespace(str);
@@ -1136,8 +1137,8 @@ static String ParseRepeat(String, int *, Boolean *, Boolean *);
static String
ParseEvent(register String str,
EventPtr event, int *reps,
- Boolean * plus,
- Boolean * error)
+ Boolean *plus,
+ Boolean *error)
{
Cardinal tmEvent;
@@ -1191,7 +1192,7 @@ ParseEvent(register String str,
static String
ParseQuotedStringEvent(register String str,
register EventPtr event,
- Boolean * error)
+ Boolean *error)
{
Value metaMask;
char s[2];
@@ -1230,7 +1231,7 @@ static EventSeqRec timerEventRec = {
};
static void
-RepeatDown(EventPtr * eventP, int reps, ActionPtr ** actionsP)
+RepeatDown(EventPtr *eventP, int reps, ActionPtr **actionsP)
{
EventRec upEventRec;
register EventPtr event, downEvent;
@@ -1279,7 +1280,7 @@ RepeatDown(EventPtr * eventP, int reps, ActionPtr ** actionsP)
}
static void
-RepeatDownPlus(EventPtr * eventP, int reps, ActionPtr ** actionsP)
+RepeatDownPlus(EventPtr *eventP, int reps, ActionPtr **actionsP)
{
EventRec upEventRec;
register EventPtr event, downEvent, lastDownEvent = NULL;
@@ -1331,7 +1332,7 @@ RepeatDownPlus(EventPtr * eventP, int reps, ActionPtr ** actionsP)
}
static void
-RepeatUp(EventPtr * eventP, int reps, ActionPtr ** actionsP)
+RepeatUp(EventPtr *eventP, int reps, ActionPtr **actionsP)
{
EventRec upEventRec;
register EventPtr event, downEvent;
@@ -1389,7 +1390,7 @@ RepeatUp(EventPtr * eventP, int reps, ActionPtr ** actionsP)
}
static void
-RepeatUpPlus(EventPtr * eventP, int reps, ActionPtr ** actionsP)
+RepeatUpPlus(EventPtr *eventP, int reps, ActionPtr **actionsP)
{
EventRec upEventRec;
register EventPtr event, downEvent, lastUpEvent = NULL;
@@ -1441,7 +1442,7 @@ RepeatUpPlus(EventPtr * eventP, int reps, ActionPtr ** actionsP)
}
static void
-RepeatOther(EventPtr * eventP, int reps, ActionPtr ** actionsP)
+RepeatOther(EventPtr *eventP, int reps, ActionPtr **actionsP)
{
register EventPtr event, tempEvent;
register int i;
@@ -1463,7 +1464,7 @@ RepeatOther(EventPtr * eventP, int reps, ActionPtr ** actionsP)
}
static void
-RepeatOtherPlus(EventPtr * eventP, int reps, ActionPtr ** actionsP)
+RepeatOtherPlus(EventPtr *eventP, int reps, ActionPtr **actionsP)
{
register EventPtr event, tempEvent;
register int i;
@@ -1486,7 +1487,7 @@ RepeatOtherPlus(EventPtr * eventP, int reps, ActionPtr ** actionsP)
}
static void
-RepeatEvent(EventPtr * eventP, int reps, Boolean plus, ActionPtr ** actionsP)
+RepeatEvent(EventPtr *eventP, int reps, Boolean plus, ActionPtr **actionsP)
{
switch ((*eventP)->event.eventType) {
@@ -1515,7 +1516,7 @@ RepeatEvent(EventPtr * eventP, int reps, Boolean plus, ActionPtr ** actionsP)
}
static String
-ParseRepeat(register String str, int *reps, Boolean * plus, Boolean * error)
+ParseRepeat(register String str, int *reps, Boolean *plus, Boolean *error)
{
/*** Parse the repetitions, for double click etc... ***/
@@ -1571,9 +1572,9 @@ ParseRepeat(register String str, int *reps, Boolean * plus, Boolean * error)
static String
ParseEventSeq(register String str,
- EventSeqPtr * eventSeqP,
+ EventSeqPtr *eventSeqP,
ActionPtr ** actionsP,
- Boolean * error)
+ Boolean *error)
{
EventSeqPtr *nextEvent = eventSeqP;
@@ -1660,7 +1661,7 @@ ParseEventSeq(register String str,
}
static String
-ParseActionProc(register String str, XrmQuark *actionProcNameP, Boolean * error)
+ParseActionProc(register String str, XrmQuark *actionProcNameP, Boolean *error)
{
register String start = str;
char procName[200];
@@ -1678,7 +1679,7 @@ ParseActionProc(register String str, XrmQuark *actionProcNameP, Boolean * error)
}
static String
-ParseString(register String str, _XtString * strP)
+ParseString(register String str, _XtString *strP)
{
register String start;
@@ -1734,7 +1735,7 @@ ParseString(register String str, _XtString * strP)
}
static String
-ParseParamSeq(register String str, String ** paramSeqP, Cardinal * paramNumP)
+ParseParamSeq(register String str, String **paramSeqP, Cardinal *paramNumP)
{
typedef struct _ParamRec *ParamPtr;
typedef struct _ParamRec {
@@ -1795,7 +1796,7 @@ ParseParamSeq(register String str, String ** paramSeqP, Cardinal * paramNumP)
}
static String
-ParseAction(String str, ActionPtr actionP, XrmQuark *quarkP, Boolean * error)
+ParseAction(String str, ActionPtr actionP, XrmQuark *quarkP, Boolean *error)
{
str = ParseActionProc(str, quarkP, error);
if (*error)
@@ -1823,8 +1824,8 @@ ParseAction(String str, ActionPtr actionP, XrmQuark *quarkP, Boolean * error)
static String
ParseActionSeq(TMParseStateTree parseTree,
String str,
- ActionPtr * actionsP,
- Boolean * error)
+ ActionPtr *actionsP,
+ Boolean *error)
{
ActionPtr *nextActionP;
@@ -1893,7 +1894,7 @@ ShowProduction(String currentProduction)
static String
ParseTranslationTableProduction(TMParseStateTree parseTree,
register String str,
- Boolean * error)
+ Boolean *error)
{
EventSeqPtr eventSeq = NULL;
ActionPtr *actionsP;
@@ -1921,7 +1922,7 @@ ParseTranslationTableProduction(TMParseStateTree parseTree,
static String
CheckForPoundSign(String str,
_XtTranslateOp defaultOp,
- _XtTranslateOp * actualOpRtn)
+ _XtTranslateOp *actualOpRtn)
{
_XtTranslateOp opType;
@@ -1959,7 +1960,7 @@ static XtTranslations
ParseTranslationTable(String source,
Boolean isAccelerator,
_XtTranslateOp defaultOp,
- Boolean * error)
+ Boolean *error)
{
XtTranslations xlations;
TMStateTree stateTrees[8];
@@ -2021,10 +2022,10 @@ ParseTranslationTable(String source,
Boolean
XtCvtStringToAcceleratorTable(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr from,
XrmValuePtr to,
- XtPointer * closure _X_UNUSED)
+ XtPointer *closure _X_UNUSED)
{
String str;
Boolean error = FALSE;
@@ -2074,10 +2075,10 @@ XtCvtStringToAcceleratorTable(Display *dpy,
Boolean
XtCvtStringToTranslationTable(Display *dpy,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr from,
XrmValuePtr to,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
String str;
Boolean error = FALSE;
@@ -2132,6 +2133,7 @@ XtParseAcceleratorTable(_Xconst char *source)
XtAccelerators ret =
(XtAccelerators) ParseTranslationTable(source, TRUE, XtTableAugment,
&error);
+
if (error == TRUE)
XtWarningMsg("parseError", "cvtStringToAcceleratorTable",
XtCXtToolkitError,
diff --git a/src/TMprint.c b/src/TMprint.c
index 53a5ca0..1208cbf 100644
--- a/src/TMprint.c
+++ b/src/TMprint.c
@@ -305,7 +305,7 @@ PrintEvent(TMStringBuf sb,
}
static void
-PrintParams(TMStringBuf sb, String * params, Cardinal num_params)
+PrintParams(TMStringBuf sb, String *params, Cardinal num_params)
{
register Cardinal i;
@@ -358,9 +358,9 @@ PrintActions(TMStringBuf sb,
static Boolean
LookAheadForCycleOrMulticlick(register StatePtr state,
- StatePtr * state_return, /* state to print, usually startState */
+ StatePtr *state_return, /* state to print, usually startState */
int *countP,
- StatePtr * nextLevelP)
+ StatePtr *nextLevelP)
{
int repeatCount = 0;
StatePtr startState = state;
@@ -490,7 +490,7 @@ typedef struct {
} PrintRec, *Print;
static int
-FindNextMatch(PrintRec * printData,
+FindNextMatch(PrintRec *printData,
TMShortCard numPrints,
XtTranslations xlations,
TMBranchHead branchHead,
@@ -538,11 +538,11 @@ FindNextMatch(PrintRec * printData,
}
static void
-ProcessLaterMatches(PrintRec * printData,
+ProcessLaterMatches(PrintRec *printData,
XtTranslations xlations,
TMShortCard tIndex,
int bIndex,
- TMShortCard * numPrintsRtn)
+ TMShortCard *numPrintsRtn)
{
TMComplexStateTree stateTree;
int i, j;
@@ -583,10 +583,10 @@ ProcessLaterMatches(PrintRec * printData,
}
static void
-ProcessStateTree(PrintRec * printData,
+ProcessStateTree(PrintRec *printData,
XtTranslations xlations,
TMShortCard tIndex,
- TMShortCard * numPrintsRtn)
+ TMShortCard *numPrintsRtn)
{
TMComplexStateTree stateTree;
int i;
@@ -727,8 +727,8 @@ _XtPrintXlations(Widget w,
void
_XtDisplayTranslations(Widget widget,
XEvent *event _X_UNUSED,
- String * params _X_UNUSED,
- Cardinal * num_params _X_UNUSED)
+ String *params _X_UNUSED,
+ Cardinal *num_params _X_UNUSED)
{
_XtString xString;
@@ -743,8 +743,8 @@ _XtDisplayTranslations(Widget widget,
void
_XtDisplayAccelerators(Widget widget,
XEvent *event _X_UNUSED,
- String * params _X_UNUSED,
- Cardinal * num_params _X_UNUSED)
+ String *params _X_UNUSED,
+ Cardinal *num_params _X_UNUSED)
{
_XtString xString;
@@ -758,8 +758,8 @@ _XtDisplayAccelerators(Widget widget,
void
_XtDisplayInstalledAccelerators(Widget widget,
XEvent *event,
- String * params _X_UNUSED,
- Cardinal * num_params _X_UNUSED)
+ String *params _X_UNUSED,
+ Cardinal *num_params _X_UNUSED)
{
Widget eventWidget
= XtWindowToWidget(event->xany.display, event->xany.window);
@@ -819,7 +819,7 @@ _XtDisplayInstalledAccelerators(Widget widget,
#endif /*NO_MIT_HACKS */
String
-_XtPrintActions(register ActionRec * actions, XrmQuark *quarkTbl)
+_XtPrintActions(register ActionRec *actions, XrmQuark *quarkTbl)
{
TMStringBufRec sbRec, *sb = &sbRec;
diff --git a/src/TMstate.c b/src/TMstate.c
index 7133c61..897d535 100644
--- a/src/TMstate.c
+++ b/src/TMstate.c
@@ -258,7 +258,7 @@ GetComplexBranchIndex(TMParseStateTree parseTree,
}
TMShortCard
-_XtGetTypeIndex(Event * event)
+_XtGetTypeIndex(Event *event)
{
TMShortCard i, j = TM_TYPE_SEGMENT_SIZE;
TMShortCard typeIndex = 0;
@@ -348,7 +348,7 @@ CompareLateModifiers(LateBindingsPtr lateBind1P, LateBindingsPtr lateBind2P)
}
TMShortCard
-_XtGetModifierIndex(Event * event)
+_XtGetModifierIndex(Event *event)
{
TMShortCard i, j = TM_MOD_SEGMENT_SIZE;
TMShortCard modIndex = 0;
@@ -609,8 +609,8 @@ HandleActions(Widget w,
XEvent *event,
TMSimpleStateTree stateTree,
Widget accelWidget,
- XtActionProc * procs,
- ActionRec * actions)
+ XtActionProc *procs,
+ ActionRec *actions)
{
ActionHook actionHookList;
Widget bindWidget;
@@ -678,7 +678,7 @@ static TMContextRec contextCache[2];
#define TM_CONTEXT_MATCHES_REALLOC 2
static void
-PushContext(TMContext * contextPtr, StatePtr newState)
+PushContext(TMContext *contextPtr, StatePtr newState)
{
TMContext context = *contextPtr;
@@ -735,7 +735,7 @@ PushContext(TMContext * contextPtr, StatePtr newState)
}
static void
-FreeContext(TMContext * contextPtr)
+FreeContext(TMContext *contextPtr)
{
TMContext context = NULL;
@@ -775,7 +775,7 @@ MatchExact(TMSimpleStateTree stateTree,
}
static void
-HandleSimpleState(Widget w, XtTM tmRecPtr, TMEventRec * curEventPtr)
+HandleSimpleState(Widget w, XtTM tmRecPtr, TMEventRec *curEventPtr)
{
XtTranslations xlations = tmRecPtr->translations;
TMContext *contextPtr = GetContextPtr(tmRecPtr);
@@ -833,7 +833,7 @@ HandleSimpleState(Widget w, XtTM tmRecPtr, TMEventRec * curEventPtr)
actions = currState->actions;
tmRecPtr->lastEventTime =
GetTime(tmRecPtr, curEventPtr->xev);
- FreeContext((TMContext *) & tmRecPtr->current_state);
+ FreeContext((TMContext *) &tmRecPtr->current_state);
match = True;
matchTreeIndex = i;
}
@@ -890,7 +890,7 @@ static int
MatchComplexBranch(TMComplexStateTree stateTree,
int startIndex,
TMContext context,
- StatePtr * leafStateRtn)
+ StatePtr *leafStateRtn)
{
TMShortCard i;
@@ -920,9 +920,9 @@ MatchComplexBranch(TMComplexStateTree stateTree,
}
static StatePtr
-TryCurrentTree(TMComplexStateTree * stateTreePtr,
+TryCurrentTree(TMComplexStateTree *stateTreePtr,
XtTM tmRecPtr,
- TMEventRec * curEventPtr)
+ TMEventRec *curEventPtr)
{
StatePtr candState = NULL, matchState = NULL;
TMContext *contextPtr = GetContextPtr(tmRecPtr);
@@ -991,14 +991,14 @@ TryCurrentTree(TMComplexStateTree * stateTreePtr,
}
static void
-HandleComplexState(Widget w, XtTM tmRecPtr, TMEventRec * curEventPtr)
+HandleComplexState(Widget w, XtTM tmRecPtr, TMEventRec *curEventPtr)
{
XtTranslations xlations = tmRecPtr->translations;
TMContext *contextPtr = GetContextPtr(tmRecPtr);
TMShortCard i, matchTreeIndex = 0;
StatePtr matchState = NULL, candState;
TMComplexStateTree *stateTreePtr =
- (TMComplexStateTree *) & xlations->stateTreeTbl[0];
+ (TMComplexStateTree *) &xlations->stateTreeTbl[0];
LOCK_PROCESS;
for (i = 0; i < xlations->numStateTrees; i++, stateTreePtr++) {
@@ -1243,7 +1243,7 @@ _XtInstallTranslations(Widget widget)
_XtTraverseStateTree(stateTree,
AggregateEventMask,
- (XtPointer) & xlations->eventMask);
+ (XtPointer) &xlations->eventMask);
mappingNotifyInterest =
(Boolean) (mappingNotifyInterest |
stateTree->simple.mappingNotifyInterest);
@@ -1268,14 +1268,14 @@ _XtInstallTranslations(Widget widget)
if (widget->core.destroy_callbacks != NULL)
_XtAddCallbackOnce((InternalCallbackList *)
- & widget->core.destroy_callbacks,
+ &widget->core.destroy_callbacks,
RemoveFromMappingCallbacks, (XtPointer) widget);
else
_XtAddCallback((InternalCallbackList *)
- & widget->core.destroy_callbacks,
+ &widget->core.destroy_callbacks,
RemoveFromMappingCallbacks, (XtPointer) widget);
}
- _XtBindActions(widget, (XtTM) & widget->core.tm);
+ _XtBindActions(widget, (XtTM) &widget->core.tm);
_XtRegisterGrabs(widget);
}
@@ -1308,7 +1308,7 @@ _XtUninstallTranslations(Widget widget)
_XtUnbindActions(widget, xlations, (TMBindData) widget->core.tm.proc_table);
_XtRemoveTranslations(widget);
widget->core.tm.translations = NULL;
- FreeContext((TMContext *) & widget->core.tm.current_state);
+ FreeContext((TMContext *) &widget->core.tm.current_state);
}
void
@@ -1361,13 +1361,13 @@ XtUninstallTranslations(Widget widget)
call_data.widget = widget;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
UNLOCK_APP(app);
}
XtTranslations
-_XtCreateXlations(TMStateTree * stateTrees,
+_XtCreateXlations(TMStateTree *stateTrees,
TMShortCard numStateTrees,
XtTranslations first,
XtTranslations second)
@@ -1469,7 +1469,7 @@ FreeActions(ActionPtr actions)
static void
AmbigActions(EventSeqPtr initialEvent,
- StatePtr * state,
+ StatePtr *state,
TMParseStateTree stateTree)
{
String params[3];
@@ -1597,10 +1597,10 @@ _XtAddEventSeqToStateTree(EventSeqPtr eventSeq, TMParseStateTree stateTree)
Boolean
_XtCvtMergeTranslations(Display *dpy _X_UNUSED,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args,
+ Cardinal *num_args,
XrmValuePtr from,
XrmValuePtr to,
- XtPointer * closure_ret _X_UNUSED)
+ XtPointer *closure_ret _X_UNUSED)
{
XtTranslations first, second, xlations;
TMStateTree *stateTrees, stackStateTrees[16];
@@ -1703,7 +1703,7 @@ UnmergeTranslations(Widget widget,
TMComplexBindProcs oldBindings,
TMShortCard numOldBindings,
TMComplexBindProcs newBindings,
- TMShortCard * numNewBindingsRtn)
+ TMShortCard *numNewBindingsRtn)
{
XtTranslations first, second, result;
@@ -1776,7 +1776,7 @@ MergeTranslations(Widget widget,
Widget source,
TMComplexBindProcs oldBindings,
TMComplexBindProcs newBindings,
- TMShortCard * numNewRtn)
+ TMShortCard *numNewRtn)
{
XtTranslations newTable = NULL, xlations;
TMComplexBindProcs bindings;
@@ -1792,7 +1792,7 @@ MergeTranslations(Widget widget,
if (newXlations->hasBindings) {
xlations = ((ATranslations) newXlations)->xlations;
bindings = (TMComplexBindProcs)
- & ((ATranslations) newXlations)->bindTbl[0];
+ &((ATranslations) newXlations)->bindTbl[0];
}
else {
xlations = newXlations;
@@ -2043,7 +2043,7 @@ ComposeTranslations(Widget dest,
XtTranslations
_XtGetTranslationValue(Widget w)
{
- XtTM tmRecPtr = (XtTM) & w->core.tm;
+ XtTM tmRecPtr = (XtTM) &w->core.tm;
ATranslations *aXlationsPtr;
TMComplexBindData cBindData = (TMComplexBindData) tmRecPtr->proc_table;
XtTranslations xlations = tmRecPtr->translations;
@@ -2055,11 +2055,11 @@ _XtGetTranslationValue(Widget w)
* header for the currently installed translations. If we have,
* just return that header. Otherwise create a new header.
*/
- for (aXlationsPtr = (ATranslations *) & cBindData->accel_context;
+ for (aXlationsPtr = (ATranslations *) &cBindData->accel_context;
*aXlationsPtr && (*aXlationsPtr)->xlations != xlations;
aXlationsPtr = &(*aXlationsPtr)->next);
if (*aXlationsPtr)
- return (XtTranslations) * aXlationsPtr;
+ return (XtTranslations) *aXlationsPtr;
else {
/* create a new aXlations context */
ATranslations aXlations;
@@ -2132,7 +2132,7 @@ _XtFreeTranslations(XtAppContext app,
XrmValuePtr toVal,
XtPointer closure _X_UNUSED,
XrmValuePtr args _X_UNUSED,
- Cardinal * num_args)
+ Cardinal *num_args)
{
XtTranslations xlations;
int i;
@@ -2248,7 +2248,7 @@ XtAugmentTranslations(Widget widget, XtTranslations new)
call_data.widget = widget;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
UNLOCK_PROCESS;
UNLOCK_APP(app);
@@ -2272,7 +2272,7 @@ XtOverrideTranslations(Widget widget, XtTranslations new)
call_data.widget = widget;
XtCallCallbackList(hookobj,
((HookObject) hookobj)->hooks.changehook_callbacks,
- (XtPointer) & call_data);
+ (XtPointer) &call_data);
}
UNLOCK_PROCESS;
UNLOCK_APP(app);
diff --git a/src/Threads.c b/src/Threads.c
index 31e5ae4..83f0b74 100644
--- a/src/Threads.c
+++ b/src/Threads.c
@@ -219,8 +219,8 @@ AppUnlock(XtAppContext app)
static void
YieldAppLock(XtAppContext app,
- Boolean * push_thread,
- Boolean * pushed_thread,
+ Boolean *push_thread,
+ Boolean *pushed_thread,
int *level)
{
LockPtr app_lock = app->lock_info;
@@ -265,7 +265,7 @@ YieldAppLock(XtAppContext app,
}
static void
-RestoreAppLock(XtAppContext app, int level, Boolean * pushed_thread)
+RestoreAppLock(XtAppContext app, int level, Boolean *pushed_thread)
{
LockPtr app_lock = app->lock_info;
xthread_t self = xthread_self();
diff --git a/src/VarCreate.c b/src/VarCreate.c
index 750f0ee..d654616 100644
--- a/src/VarCreate.c
+++ b/src/VarCreate.c
@@ -256,13 +256,13 @@ XtVaSetSubvalues(XtPointer base,
}
Widget
-_XtVaOpenApplication(XtAppContext * app_context_return,
+_XtVaOpenApplication(XtAppContext *app_context_return,
_Xconst char *application_class,
XrmOptionDescList options,
Cardinal num_options,
int *argc_in_out,
- _XtString * argv_in_out,
- String * fallback_resources,
+ _XtString *argv_in_out,
+ String *fallback_resources,
WidgetClass widget_class,
va_list var_args)
{
@@ -320,13 +320,13 @@ _XtVaOpenApplication(XtAppContext * app_context_return,
}
Widget
-_XtVaAppInitialize(XtAppContext * app_context_return,
+_XtVaAppInitialize(XtAppContext *app_context_return,
_Xconst char *application_class,
XrmOptionDescList options,
Cardinal num_options,
int *argc_in_out,
- _XtString * argv_in_out,
- String * fallback_resources,
+ _XtString *argv_in_out,
+ String *fallback_resources,
va_list var_args)
{
return _XtVaOpenApplication(app_context_return, application_class,
@@ -343,13 +343,13 @@ _XtVaAppInitialize(XtAppContext * app_context_return,
*/
Widget
-XtVaOpenApplication(XtAppContext * app_context_return,
+XtVaOpenApplication(XtAppContext *app_context_return,
_Xconst char *application_class,
XrmOptionDescList options,
Cardinal num_options,
int *argc_in_out,
- _XtString * argv_in_out,
- String * fallback_resources,
+ _XtString *argv_in_out,
+ String *fallback_resources,
WidgetClass widget_class,
...)
{
@@ -365,13 +365,13 @@ XtVaOpenApplication(XtAppContext * app_context_return,
}
Widget
-XtVaAppInitialize(XtAppContext * app_context_return,
+XtVaAppInitialize(XtAppContext *app_context_return,
_Xconst char *application_class,
XrmOptionDescList options,
Cardinal num_options,
int *argc_in_out,
- _XtString * argv_in_out,
- String * fallback_resources,
+ _XtString *argv_in_out,
+ String *fallback_resources,
...)
{
Widget code;
diff --git a/src/Varargs.c b/src/Varargs.c
index 4ab2432..3dbcfa6 100644
--- a/src/Varargs.c
+++ b/src/Varargs.c
@@ -326,8 +326,8 @@ _XtFreeArgList(ArgList args, /* as returned by _XtVaToArgList */
}
}
-static void GetResources(Widget widget, XtResourceList * res_list,
- Cardinal * number);
+static void GetResources(Widget widget, XtResourceList *res_list,
+ Cardinal *number);
/*
* Given a variable argument list, _XtVaToArgList() returns the
@@ -339,8 +339,8 @@ void
_XtVaToArgList(Widget widget,
va_list var,
int max_count,
- ArgList * args_return,
- Cardinal * num_args_return)
+ ArgList *args_return,
+ Cardinal *num_args_return)
{
String attr;
int count;
@@ -422,7 +422,7 @@ _XtVaToArgList(Widget widget,
*/
static void
-GetResources(Widget widget, XtResourceList * res_list, Cardinal * number)
+GetResources(Widget widget, XtResourceList *res_list, Cardinal *number)
{
Widget parent = XtParent(widget);
@@ -487,8 +487,8 @@ NestedArgtoTypedArg(XtTypedArgList args, XtTypedArgList avlist)
void
_XtVaToTypedArgList(va_list var,
int max_count,
- XtTypedArgList * args_return,
- Cardinal * num_args_return)
+ XtTypedArgList *args_return,
+ Cardinal *num_args_return)
{
XtTypedArgList args = NULL;
String attr;
diff --git a/src/Vendor.c b/src/Vendor.c
index 6860599..2a211b2 100644
--- a/src/Vendor.c
+++ b/src/Vendor.c
@@ -85,7 +85,7 @@ DllMain(unsigned long mod_handle, unsigned long flag, void *routine)
externaldef(vendorshellclassrec)
VendorShellClassRec vendorShellClassRec = {
{
- /* superclass */ (WidgetClass) & wmShellClassRec,
+ /* superclass */ (WidgetClass) &wmShellClassRec,
/* class_name */ "VendorShell",
/* size */ sizeof(VendorShellRec),
/* Class Initializer */ NULL,
diff --git a/src/sharedlib.c b/src/sharedlib.c
index 600f83d..8ddb05f 100644
--- a/src/sharedlib.c
+++ b/src/sharedlib.c
@@ -35,15 +35,15 @@ in this Software without prior written authorization from The Open Group.
#include "CreateI.h"
#if defined(AIXSHLIB)
-WidgetClass vendorShellWidgetClass = (WidgetClass) & vendorShellClassRec;
+WidgetClass vendorShellWidgetClass = (WidgetClass) &vendorShellClassRec;
static void
_XtVendorInitialize()
{
transientShellWidgetClass->core_class.superclass =
- (WidgetClass) & vendorShellClassRec;
+ (WidgetClass) &vendorShellClassRec;
topLevelShellWidgetClass->core_class.superclass =
- (WidgetClass) & vendorShellClassRec;
+ (WidgetClass) &vendorShellClassRec;
}
#define VENDORINIT _XtVendorInitialize();
@@ -88,7 +88,7 @@ Widget
XtInitialize(_Xconst char *name,
_Xconst char *classname,
XrmOptionDescRec *options,
- Cardinal num_options, int *argc, String * argv)
+ Cardinal num_options, int *argc, String *argv)
{
extern Widget _XtInitialize();
@@ -97,13 +97,13 @@ XtInitialize(_Xconst char *name,
}
Widget
-XtAppInitialize(XtAppContext * app_context_return,
+XtAppInitialize(XtAppContext *app_context_return,
_Xconst char *application_class,
XrmOptionDescRec *options,
Cardinal num_options,
int *argc_in_out,
- String * argv_in_out,
- String * fallback_resources,
+ String *argv_in_out,
+ String *fallback_resources,
ArgList args_in, Cardinal num_args_in)
{
extern Widget _XtAppInitialize();
@@ -115,12 +115,12 @@ XtAppInitialize(XtAppContext * app_context_return,
}
Widget
-XtVaAppInitialize(XtAppContext * app_context_return,
+XtVaAppInitialize(XtAppContext *app_context_return,
_Xconst char *application_class,
XrmOptionDescList options,
Cardinal num_options,
int *argc_in_out,
- String * argv_in_out, String * fallback_resources, ...)
+ String *argv_in_out, String *fallback_resources, ...)
{
va_list var;
extern Widget _XtVaAppInitialize();
@@ -133,13 +133,13 @@ XtVaAppInitialize(XtAppContext * app_context_return,
}
Widget
-XtOpenApplication(XtAppContext * app_context_return,
+XtOpenApplication(XtAppContext *app_context_return,
_Xconst char *application_class,
XrmOptionDescRec *options,
Cardinal num_options,
int *argc_in_out,
- String * argv_in_out,
- String * fallback_resources,
+ String *argv_in_out,
+ String *fallback_resources,
WidgetClass widget_class,
ArgList args_in, Cardinal num_args_in)
{
@@ -153,13 +153,13 @@ XtOpenApplication(XtAppContext * app_context_return,
}
Widget
-XtVaOpenApplication(XtAppContext * app_context_return,
+XtVaOpenApplication(XtAppContext *app_context_return,
_Xconst char *application_class,
XrmOptionDescList options,
Cardinal num_options,
int *argc_in_out,
- String * argv_in_out,
- String * fallback_resources, WidgetClass widget_class, ...)
+ String *argv_in_out,
+ String *fallback_resources, WidgetClass widget_class, ...)
{
va_list var;
extern Widget _XtVaOpenApplication();
@@ -184,44 +184,44 @@ static int dummy; /* avoid warning from ranlib */
int _XtInheritTranslations = 0;
extern CompositeClassRec compositeClassRec;
-WidgetClass compositeWidgetClass = (WidgetClass) & compositeClassRec;
+WidgetClass compositeWidgetClass = (WidgetClass) &compositeClassRec;
extern ConstraintClassRec constraintClassRec;
-WidgetClass constraintWidgetClass = (WidgetClass) & constraintClassRec;
+WidgetClass constraintWidgetClass = (WidgetClass) &constraintClassRec;
extern WidgetClassRec widgetClassRec;
WidgetClass widgetClass = &widgetClassRec;
WidgetClass coreWidgetClass = &widgetClassRec;
extern ObjectClassRec objectClassRec;
-WidgetClass objectClass = (WidgetClass) & objectClassRec;
+WidgetClass objectClass = (WidgetClass) &objectClassRec;
extern RectObjClassRec rectObjClassRec;
-WidgetClass rectObjClass = (WidgetClass) & rectObjClassRec;
+WidgetClass rectObjClass = (WidgetClass) &rectObjClassRec;
extern ShellClassRec shellClassRec;
-WidgetClass shellWidgetClass = (WidgetClass) & shellClassRec;
+WidgetClass shellWidgetClass = (WidgetClass) &shellClassRec;
extern OverrideShellClassRec overrideShellClassRec;
-WidgetClass overrideShellWidgetClass = (WidgetClass) & overrideShellClassRec;
+WidgetClass overrideShellWidgetClass = (WidgetClass) &overrideShellClassRec;
extern WMShellClassRec wmShellClassRec;
-WidgetClass wmShellWidgetClass = (WidgetClass) & wmShellClassRec;
+WidgetClass wmShellWidgetClass = (WidgetClass) &wmShellClassRec;
extern TransientShellClassRec transientShellClassRec;
-WidgetClass transientShellWidgetClass = (WidgetClass) & transientShellClassRec;
+WidgetClass transientShellWidgetClass = (WidgetClass) &transientShellClassRec;
extern TopLevelShellClassRec topLevelShellClassRec;
-WidgetClass topLevelShellWidgetClass = (WidgetClass) & topLevelShellClassRec;
+WidgetClass topLevelShellWidgetClass = (WidgetClass) &topLevelShellClassRec;
extern ApplicationShellClassRec applicationShellClassRec;
WidgetClass applicationShellWidgetClass =
- (WidgetClass) & applicationShellClassRec;
+ (WidgetClass) &applicationShellClassRec;
extern SessionShellClassRec sessionShellClassRec;
-WidgetClass sessionShellWidgetClass = (WidgetClass) & sessionShellClassRec;
+WidgetClass sessionShellWidgetClass = (WidgetClass) &sessionShellClassRec;
extern HookObjClassRec hookObjClassRec;
-WidgetClass hookObjectClass = (WidgetClass) & hookObjClassRec;
+WidgetClass hookObjectClass = (WidgetClass) &hookObjClassRec;
#endif /* SUNSHLIB */