diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/ActionHook.c | 2 | ||||
-rw-r--r-- | src/Alloc.c | 2 | ||||
-rw-r--r-- | src/Makefile.am | 10 | ||||
-rw-r--r-- | src/PopupCB.c | 8 | ||||
-rw-r--r-- | src/Resources.c | 32 | ||||
-rw-r--r-- | src/SetSens.c | 4 | ||||
-rw-r--r-- | src/TMaction.c | 2 | ||||
-rw-r--r-- | src/VarCreate.c | 26 | ||||
-rw-r--r-- | src/Varargs.c | 2 | ||||
-rw-r--r-- | src/Vendor.c | 14 | ||||
-rw-r--r-- | src/sharedlib.c | 6 |
11 files changed, 54 insertions, 54 deletions
diff --git a/src/ActionHook.c b/src/ActionHook.c index efa898e..b03a116 100644 --- a/src/ActionHook.c +++ b/src/ActionHook.c @@ -70,7 +70,7 @@ in this Software without prior written authorization from The Open Group. */ -/* +/* * Contains XtAppAddActionHook, XtRemoveActionHook */ diff --git a/src/Alloc.c b/src/Alloc.c index be643a8..c523d81 100644 --- a/src/Alloc.c +++ b/src/Alloc.c @@ -524,7 +524,7 @@ void _XtPrintMemory(char * filename) if (filename == NULL) f = stderr; - else + else f = fopen(filename, "w"); LOCK_PROCESS; fprintf(f, "total size: %d\n", ActiveXtMemory); diff --git a/src/Makefile.am b/src/Makefile.am index 2b39ec5..cf54a5c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -77,16 +77,16 @@ libXt_la_LIBADD = @XT_LIBS@ libXt_la_LDFLAGS = -version-number 6:0:0 -no-undefined # -# The util directory contains a program that builds some of the sources. +# The util directory contains a program that builds some of the sources. # The input to this program is given in files. Unfortunately those input # files refers to things like -# +# # util/foo -# +# # so the generating program must be run from the top directory. -# +# -BUILT_SOURCE = StringDefs.c +BUILT_SOURCE = StringDefs.c BUILT_HEADER = $(top_builddir)/include/X11/StringDefs.h $(top_builddir)/include/X11/Shell.h BUILT_FILES = $(BUILT_SOURCE) $(BUILT_HEADER) diff --git a/src/PopupCB.c b/src/PopupCB.c index dece66b..38cba26 100644 --- a/src/PopupCB.c +++ b/src/PopupCB.c @@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/src/Resources.c b/src/Resources.c index dc0f563..2ac2eae 100644 --- a/src/Resources.c +++ b/src/Resources.c @@ -233,7 +233,7 @@ static Cardinal CountTreeDepth( { Cardinal count; - for (count = 1; w != NULL; w = (Widget) w->core.parent) + for (count = 1; w != NULL; w = (Widget) w->core.parent) count++; return count; @@ -371,7 +371,7 @@ void _XtDependencies( new_res = (XrmResourceList *) __XtMalloc(new_num_res*sizeof(XrmResourceList)); if (super_num_res > 0) XtMemmove(new_res, super_res, super_num_res * sizeof(XrmResourceList)); - + /* Put pointers to class resource entries into new_res */ new_next = super_num_res; for (i = 0; i < class_num_res; i++) { @@ -449,7 +449,7 @@ void _XtConstraintResDependencies( - + XrmResourceList* _XtCreateIndirectionTable ( XtResourceList resources, Cardinal num_resources) @@ -559,11 +559,11 @@ static XtCacheRef *GetResources( i++, typed_arg++) { register XrmRepresentation argType; argName = quark_args[i]; - argType = (typed_arg->type == NULL) ? NULLQUARK + argType = (typed_arg->type == NULL) ? NULLQUARK : XrmStringToRepresentation(typed_arg->type); if (argName == QinitialResourcesPersistent) { persistent_resources = (Boolean)typed_arg->value; - found_persistence = True; + found_persistence = True; break; } for (j = 0, res = table; j < num_resources; j++, res++) { @@ -579,7 +579,7 @@ static XtCacheRef *GetResources( } found[j] = TRUE; break; - } + } } } } @@ -596,7 +596,7 @@ static XtCacheRef *GetResources( sizeof(XrmHashTable) * (searchListSize *= 2)); } - + if (persistent_resources) cache_base = NULL; else @@ -702,14 +702,14 @@ static XtCacheRef *GetResources( register XtTypedArg* arg = typed_args + typed[j] - 1; /* - * This resource value has been specified as a typed arg and - * has to be converted. Typed arg conversions are done here + * This resource value has been specified as a typed arg and + * has to be converted. Typed arg conversions are done here * to correctly interpose them with normal resource conversions. */ XrmQuark from_type; XrmValue from_val, to_val; Boolean converted; - + from_type = StringToQuark(arg->type); from_val.size = arg->size; if ((from_type == QString) || ((unsigned) arg->size > sizeof(XtArgVal))) @@ -862,7 +862,7 @@ static XtCacheRef *GetResources( } num_typed_args--; } - } + } } if (tm_hack) widget->core.tm.current_state = NULL; @@ -965,7 +965,7 @@ XtCacheRef *_XtGetResources( /* Get names, classes for widget and ancestors */ GetNamesAndClasses(w, names, classes); - + /* Compile arg list into quarks */ CacheArgs(args, num_args, typed_args, *num_typed_args, quark_cache, XtNumber(quark_cache), &quark_args); @@ -1002,7 +1002,7 @@ void _XtGetSubresources ( const char* name, /* name of subobject */ const char* class, /* class of subobject */ XtResourceList resources, /* resource list for subobject */ - Cardinal num_resources, + Cardinal num_resources, ArgList args, /* arg list to override resources */ Cardinal num_args, XtTypedArgList typed_args, @@ -1043,7 +1043,7 @@ void _XtGetSubresources ( if (((int) resources->resource_offset) >= 0) { XrmCompileResourceListEphem(resources, num_resources); } - table = _XtCreateIndirectionTable(resources, num_resources); + table = _XtCreateIndirectionTable(resources, num_resources); Resrc = GetResources(w, (char*)base, names, classes, table, num_resources, quark_args, args, num_args, typed_args, &ntyped_args, False); @@ -1061,7 +1061,7 @@ void XtGetSubresources ( _Xconst char* name, /* name of subobject */ _Xconst char* class, /* class of subobject */ XtResourceList resources, /* resource list for subobject */ - Cardinal num_resources, + Cardinal num_resources, ArgList args, /* arg list to override resources */ Cardinal num_args) { @@ -1118,7 +1118,7 @@ void _XtGetApplicationResources ( } /* Compile arg list into quarks */ - CacheArgs(args, num_args, typed_args, num_typed_args, quark_cache, + CacheArgs(args, num_args, typed_args, num_typed_args, quark_cache, XtNumber(quark_cache), &quark_args); /* Compile resource list if needed */ if (((int) resources->resource_offset) >= 0) { diff --git a/src/SetSens.c b/src/SetSens.c index fd7777c..85443a5 100644 --- a/src/SetSens.c +++ b/src/SetSens.c @@ -94,7 +94,7 @@ static void SetAncestorSensitive( /* If widget's sensitive is TRUE, propagate new ancestor_sensitive to children's ancestor_sensitive; else do nothing as children's ancestor_sensitive is already FALSE */ - + if (widget->core.sensitive && XtIsComposite(widget)) { children = ((CompositeWidget) widget)->composite.children; for (i=0; i < ((CompositeWidget)widget)->composite.num_children; i++) { @@ -125,7 +125,7 @@ void XtSetSensitive( /* If widget's ancestor_sensitive is TRUE, propagate new sensitive to children's ancestor_sensitive; else do nothing as children's ancestor_sensitive is already FALSE */ - + if (widget->core.ancestor_sensitive && XtIsComposite (widget)) { children = ((CompositeWidget) widget)->composite.children; for (i = 0; i < ((CompositeWidget)widget)->composite.num_children; i++){ diff --git a/src/TMaction.c b/src/TMaction.c index bbf1e34..7af75ad 100644 --- a/src/TMaction.c +++ b/src/TMaction.c @@ -70,7 +70,7 @@ in this Software without prior written authorization from The Open Group. */ -/* TMaction.c -- maintains the state table of actions for the translation +/* TMaction.c -- maintains the state table of actions for the translation * manager. */ diff --git a/src/VarCreate.c b/src/VarCreate.c index 9821fc1..0fba379 100644 --- a/src/VarCreate.c +++ b/src/VarCreate.c @@ -76,12 +76,12 @@ _XtVaCreateWidget( _XtVaToTypedArgList(var, count, &typed_args, &num_args); - widget = _XtCreateWidget(name, widget_class, parent, (ArgList)NULL, + widget = _XtCreateWidget(name, widget_class, parent, (ArgList)NULL, (Cardinal)0, typed_args, num_args); if (typed_args != NULL) { XtFree((XtPointer)typed_args); - } + } return widget; } @@ -168,7 +168,7 @@ XtVaAppCreateShell( if (typed_args != NULL) { XtFree((XtPointer)typed_args); } - + va_end(var); UNLOCK_APP(app); return widget; @@ -239,7 +239,7 @@ XtVaSetSubvalues(XtPointer base, XtResourceList resources, Cardinal num_resource va_list var; ArgList args; Cardinal num_args; - int total_count, typed_count; + int total_count, typed_count; va_start(var, num_resources); _XtCountVaList(var, &total_count, &typed_count); @@ -256,7 +256,7 @@ XtVaSetSubvalues(XtPointer base, XtResourceList resources, Cardinal num_resource if (num_args != 0) { XtFree((XtPointer)args); - } + } va_end(var); } @@ -282,7 +282,7 @@ _XtVaOpenApplication( XtTypedArgList typed_args; XtToolkitInitialize(); /* cannot be moved into _XtAppInit */ - + dpy = _XtAppInit(&app_con, (String)application_class, options, num_options, argc_in_out, &argv_in_out, fallback_resources); @@ -301,8 +301,8 @@ _XtVaOpenApplication( typed_args[count].size = 0; } count++; - typed_args = (XtTypedArgList) - XtRealloc((char *) typed_args, + typed_args = (XtTypedArgList) + XtRealloc((char *) typed_args, (unsigned) (count + 1) * sizeof(XtTypedArg)); } typed_args[count].name = NULL; @@ -310,14 +310,14 @@ _XtVaOpenApplication( va_end (var_args); root = - XtVaAppCreateShell( NULL, application_class, + XtVaAppCreateShell( NULL, application_class, widget_class, dpy, XtNscreen, (XtArgVal)DefaultScreenOfDisplay(dpy), XtNargc, (XtArgVal)saved_argc, XtNargv, (XtArgVal)argv_in_out, XtVaNestedList, (XtVarArgsList)typed_args, NULL ); - + if (app_context_return != NULL) *app_context_return = app_con; @@ -346,7 +346,7 @@ _XtVaAppInitialize( #if !((defined(SUNSHLIB) || defined(AIXSHLIB)) && defined(SHAREDCODE)) /* - * If not used as a shared library, we still need a front end to + * If not used as a shared library, we still need a front end to * _XtVaOpenApplication and to _XtVaAppInitialize. */ @@ -364,7 +364,7 @@ XtVaOpenApplication( { va_list var; - va_start(var, widget_class); + va_start(var, widget_class); return _XtVaOpenApplication(app_context_return, (String)application_class, options, num_options, argc_in_out, argv_in_out, fallback_resources, widget_class, var); @@ -383,7 +383,7 @@ XtVaAppInitialize( { va_list var; - va_start(var, fallback_resources); + va_start(var, fallback_resources); return _XtVaOpenApplication(app_context_return, (String)application_class, options, num_options, argc_in_out, argv_in_out, fallback_resources, diff --git a/src/Varargs.c b/src/Varargs.c index 13bf86d..b33e287 100644 --- a/src/Varargs.c +++ b/src/Varargs.c @@ -502,7 +502,7 @@ _XtVaToTypedArgList( args[count].size = va_arg(var, int); ++count; } else if (strcmp(attr, XtVaNestedList) == 0) { - count += NestedArgtoTypedArg(&args[count], + count += NestedArgtoTypedArg(&args[count], va_arg(var, XtTypedArgList)); } else { args[count].name = attr; diff --git a/src/Vendor.c b/src/Vendor.c index e4fd24f..26767b7 100644 --- a/src/Vendor.c +++ b/src/Vendor.c @@ -27,13 +27,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -110,7 +110,7 @@ externaldef(vendorshellclassrec) VendorShellClassRec vendorShellClassRec = { /* class_part_initialize*/ NULL, /* Class init'ed ? */ FALSE, /* initialize */ NULL, - /* initialize_notify */ NULL, + /* initialize_notify */ NULL, /* realize */ XtInheritRealize, /* actions */ NULL, /* num_actions */ 0, @@ -125,8 +125,8 @@ externaldef(vendorshellclassrec) VendorShellClassRec vendorShellClassRec = { /* resize */ XtInheritResize, /* expose */ NULL, /* set_values */ NULL, - /* set_values_hook */ NULL, - /* set_values_almost */ XtInheritSetValuesAlmost, + /* set_values_hook */ NULL, + /* set_values_almost */ XtInheritSetValuesAlmost, /* get_values_hook */ NULL, /* accept_focus */ NULL, /* intrinsics version */ XtVersion, diff --git a/src/sharedlib.c b/src/sharedlib.c index 1322d8c..7aefc23 100644 --- a/src/sharedlib.c +++ b/src/sharedlib.c @@ -81,7 +81,7 @@ void XtToolkitInitialize() _XtToolkitInitialize(); } -Widget +Widget XtInitialize( _Xconst char* name, _Xconst char* classname, @@ -110,7 +110,7 @@ XtAppInitialize( extern Widget _XtAppInitialize(); VENDORINIT return _XtAppInitialize (app_context_return, application_class, options, - num_options, argc_in_out, argv_in_out, + num_options, argc_in_out, argv_in_out, fallback_resources, args_in, num_args_in); } @@ -151,7 +151,7 @@ XtOpenApplication( extern Widget _XtOpenApplication(); VENDORINIT return _XtOpenApplication (app_context_return, application_class, options, - num_options, argc_in_out, argv_in_out, + num_options, argc_in_out, argv_in_out, fallback_resources, widget_class, args_in, num_args_in); } |