diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2019-03-20 05:07:21 -0400 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@his.com> | 2019-04-16 19:39:55 +0000 |
| commit | e53726577e18f37186d7996dc85dc82de9532d22 (patch) | |
| tree | e9950cf4c7068bc82c556ccfe280f959add600b1 /src/Display.c | |
| parent | 13ed4421006c3bc7743233a401ce80f849dd889b (diff) | |
Allow all of the "argv" strings to be writable, since those arrays may
be updated during initialization.
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
Diffstat (limited to 'src/Display.c')
| -rw-r--r-- | src/Display.c | 12 |
1 files changed, 6 insertions, 6 deletions
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; |