From e53726577e18f37186d7996dc85dc82de9532d22 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Wed, 20 Mar 2019 05:07:21 -0400 Subject: Allow all of the "argv" strings to be writable, since those arrays may be updated during initialization. Signed-off-by: Thomas E. Dickey --- include/X11/CreateI.h | 2 +- include/X11/InitialI.h | 4 ++-- include/X11/Intrinsic.h | 14 +++++++------- include/X11/ShellP.h | 2 +- src/Converters.c | 4 ++-- src/Create.c | 4 ++-- src/Display.c | 12 ++++++------ src/Error.c | 2 +- src/Initialize.c | 8 ++++---- src/Intrinsic.c | 4 ++-- src/TMprint.c | 4 ++-- src/VarCreate.c | 6 +++--- 12 files changed, 33 insertions(+), 33 deletions(-) diff --git a/include/X11/CreateI.h b/include/X11/CreateI.h index c783be7..6b47c7c 100644 --- a/include/X11/CreateI.h +++ b/include/X11/CreateI.h @@ -34,7 +34,7 @@ extern Widget _XtVaOpenApplication(XtAppContext *app_context_return, extern Widget _XtVaAppInitialize(XtAppContext *app_context_return, _Xconst char* application_class, XrmOptionDescList options, Cardinal num_options, - int *argc_in_out, String *argv_in_out, + int *argc_in_out, _XtString *argv_in_out, String *fallback_resources, va_list var_args); _XFUNCPROTOEND diff --git a/include/X11/InitialI.h b/include/X11/InitialI.h index 95a3664..224190d 100644 --- a/include/X11/InitialI.h +++ b/include/X11/InitialI.h @@ -384,7 +384,7 @@ extern void _XtDisplayInitialize( XrmOptionDescRec* /* urlist */, Cardinal /* num_urs */, int* /* argc */, - char** /* argv */ + _XtString* /* argv */ ); extern void _XtCacheFlushTag( @@ -421,7 +421,7 @@ extern void _XtFreeWWTable( extern String _XtGetUserName(_XtString dest, int len); extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist, - Cardinal num_urs, int argc, String *argv, + Cardinal num_urs, int argc, _XtString *argv, String *applName, String *displayName, String *language); diff --git a/include/X11/Intrinsic.h b/include/X11/Intrinsic.h index 100b022..1f98d4c 100644 --- a/include/X11/Intrinsic.h +++ b/include/X11/Intrinsic.h @@ -405,7 +405,7 @@ typedef Boolean (*XtWorkProc)( typedef struct { char match; - String substitution; + _XtString substitution; } SubstitutionRec, *Substitution; typedef Boolean (*XtFilePredicate)( @@ -1446,7 +1446,7 @@ extern void XtDisplayInitialize( XrmOptionDescRec* /* options */, Cardinal /* num_options */, int* /* argc */, - String* /* argv */ + _XtString* /* argv */ ); extern Widget XtOpenApplication( @@ -1468,7 +1468,7 @@ extern Widget XtVaOpenApplication( XrmOptionDescList /* options */, Cardinal /* num_options */, int* /* argc_in_out */, - String* /* argv_in_out */, + _XtString* /* argv_in_out */, String* /* fallback_resources */, WidgetClass /* widget_class */, ... @@ -1492,7 +1492,7 @@ extern Widget XtVaAppInitialize( /* obsolete */ XrmOptionDescList /* options */, Cardinal /* num_options */, int* /* argc_in_out */, - String* /* argv_in_out */, + _XtString* /* argv_in_out */, String* /* fallback_resources */, ... ) _X_SENTINEL(0); @@ -1503,7 +1503,7 @@ extern Widget XtInitialize( /* obsolete */ XrmOptionDescRec* /* options */, Cardinal /* num_options */, int* /* argc */, - String* /* argv */ + _XtString* /* argv */ ); extern Display *XtOpenDisplay( @@ -1514,7 +1514,7 @@ extern Display *XtOpenDisplay( XrmOptionDescRec* /* options */, Cardinal /* num_options */, int* /* argc */, - String* /* argv */ + _XtString* /* argv */ ); extern XtAppContext XtCreateApplicationContext( @@ -1990,7 +1990,7 @@ extern String XtFindFile( XtFilePredicate /* predicate */ ); -extern String XtResolvePathname( +extern _XtString XtResolvePathname( Display* /* dpy */, _Xconst _XtString /* type */, _Xconst _XtString /* filename */, diff --git a/include/X11/ShellP.h b/include/X11/ShellP.h index beec6bf..f7aa4c1 100644 --- a/include/X11/ShellP.h +++ b/include/X11/ShellP.h @@ -332,7 +332,7 @@ typedef struct { #endif XrmClass xrm_class; int argc; - char **argv; + _XtString *argv; } ApplicationShellPart; typedef struct { diff --git a/src/Converters.c b/src/Converters.c index 3402a24..e812930 100644 --- a/src/Converters.c +++ b/src/Converters.c @@ -1704,10 +1704,10 @@ static void ArgArrayDestructor( XrmValuePtr args, Cardinal *num_args) { - String *strarray; + _XtString *strarray; if (closure) { - strarray = (String*) closure; + strarray = (_XtString*) closure; XtFree(*strarray); XtFree((char *) strarray); } diff --git a/src/Create.c b/src/Create.c index 47ba2ca..f818c0b 100644 --- a/src/Create.c +++ b/src/Create.c @@ -336,8 +336,8 @@ CompileCallbacks( static Widget xtCreate( - char *name, - char *class, + String name, + String class, WidgetClass widget_class, Widget parent, Screen* default_screen, /* undefined when creating a nonwidget */ diff --git a/src/Display.c b/src/Display.c index e7d4432..8f22890 100644 --- a/src/Display.c +++ b/src/Display.c @@ -249,7 +249,7 @@ Display *XtOpenDisplay( XrmOptionDescRec *urlist, Cardinal num_urs, int *argc, - String *argv) + _XtString *argv) { Display *d; XrmDatabase db = NULL; @@ -289,7 +289,7 @@ Display *XtOpenDisplay( int len; displayName = XDisplayName(displayName); len = (int) strlen (displayName); - app->display_name_tried = (String) __XtMalloc ((Cardinal)(len + 1)); + app->display_name_tried = (_XtString) __XtMalloc ((Cardinal)(len + 1)); strncpy ((char*) app->display_name_tried, displayName, (size_t) (len + 1)); app->display_name_tried[len] = '\0'; } @@ -308,7 +308,7 @@ _XtAppInit( _XtString **argv_in_out, String * fallback_resources) { - String *saved_argv; + _XtString *saved_argv; int i; Display *dpy; @@ -316,8 +316,8 @@ _XtAppInit( * Save away argv and argc so we can set the properties later */ - saved_argv = (String *) - __XtMalloc( (Cardinal)((size_t)(*argc_in_out + 1) * sizeof(String)) ); + saved_argv = (_XtString *) + __XtMalloc( (Cardinal)((size_t)(*argc_in_out + 1) * sizeof(_XtString)) ); for (i = 0 ; i < *argc_in_out ; i++) saved_argv[i] = (*argv_in_out)[i]; saved_argv[i] = NULL; /* NULL terminate that sucker. */ @@ -354,7 +354,7 @@ XtDisplayInitialize( XrmOptionDescRec *urlist, Cardinal num_urs, int *argc, - String *argv + _XtString *argv ) { XtPerDisplay pd; diff --git a/src/Error.c b/src/Error.c index b484bbf..38d4e15 100644 --- a/src/Error.c +++ b/src/Error.c @@ -154,7 +154,7 @@ void XtAppGetErrorDatabaseText( XrmDatabase db) { String str_class; - String type_str; + _XtString type_str; XrmValue result; char *str_name = NULL; char *temp = NULL; diff --git a/src/Initialize.c b/src/Initialize.c index bc845bc..363920e 100644 --- a/src/Initialize.c +++ b/src/Initialize.c @@ -754,7 +754,7 @@ XrmDatabase _XtPreparseCommandLine( XrmOptionDescRec *urlist, Cardinal num_urs, int argc, - String *argv, + _XtString *argv, /* return */ String *applName, String *displayName, @@ -767,10 +767,10 @@ XrmDatabase _XtPreparseCommandLine( XrmName class_list[3]; XrmRepresentation type; XrmValue val; - String *targv; + _XtString *targv; int targc = argc; - targv = (String *) __XtMalloc((Cardinal)(sizeof(char *) * (size_t)argc)); + 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, &options, &num_options); @@ -1050,7 +1050,7 @@ XtInitialize( XrmOptionDescRec *options, Cardinal num_options, int *argc, - String *argv) + _XtString *argv) { Widget root; XtAppContext app_con; diff --git a/src/Intrinsic.c b/src/Intrinsic.c index cd70b15..e938e98 100644 --- a/src/Intrinsic.c +++ b/src/Intrinsic.c @@ -1061,7 +1061,7 @@ static Boolean Resolve( String XtFindFile( - _Xconst char* path, + _Xconst _XtString path, Substitution substitutions, Cardinal num_substitutions, XtFilePredicate predicate) @@ -1334,7 +1334,7 @@ static SubstitutionRec defaultSubs[] = { }; -String XtResolvePathname( +_XtString XtResolvePathname( Display *dpy, _Xconst char* type, _Xconst char* filename, diff --git a/src/TMprint.c b/src/TMprint.c index 2d5613e..226f06d 100644 --- a/src/TMprint.c +++ b/src/TMprint.c @@ -86,14 +86,14 @@ typedef struct _TMStringBufRec{ #define STR_INCAMOUNT 100 #define CHECK_STR_OVERFLOW(sb) \ if (sb->current - sb->start > (int)sb->max - STR_THRESHOLD) \ -{ String old = sb->start; \ +{ _XtString old = sb->start; \ sb->start = XtRealloc(old, (Cardinal)(sb->max += STR_INCAMOUNT)); \ sb->current = sb->current - old + sb->start; \ } #define ExpandForChars(sb, nchars ) \ if ((unsigned)(sb->current - sb->start) > (sb->max - STR_THRESHOLD - nchars)) { \ - String old = sb->start; \ + _XtString old = sb->start; \ sb->start = XtRealloc(old, \ (Cardinal)(sb->max = (Cardinal)(sb->max + STR_INCAMOUNT + (Cardinal) nchars))); \ sb->current = sb->current - old + sb->start; \ diff --git a/src/VarCreate.c b/src/VarCreate.c index 67e73e4..eb2c35a 100644 --- a/src/VarCreate.c +++ b/src/VarCreate.c @@ -328,7 +328,7 @@ _XtVaAppInitialize( XrmOptionDescList options, Cardinal num_options, int *argc_in_out, - String *argv_in_out, + _XtString *argv_in_out, String *fallback_resources, va_list var_args) { @@ -352,7 +352,7 @@ XtVaOpenApplication( XrmOptionDescList options, Cardinal num_options, int *argc_in_out, - String *argv_in_out, + _XtString *argv_in_out, String *fallback_resources, WidgetClass widget_class, ...) @@ -372,7 +372,7 @@ XtVaAppInitialize( XrmOptionDescList options, Cardinal num_options, int *argc_in_out, - String *argv_in_out, + _XtString *argv_in_out, String *fallback_resources, ...) { -- cgit v1.2.3