debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtimsstart: Resolve all compiler warnings

Browse Source
This commit is contained in:
Peter Howkins
2018-04-28 21:17:28 +01:00
parent e524a14c9c
commit 55c120b287
4 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cde/programs/dtimsstart/env.c
View File

@@ -99,7 +99,7 @@ int get_user_environ()
if ((p = Opt.DisplayName) && *p) {
strcpy(buf, "DISPLAY=");
strcat(buf, p);
putenv(NEWSTR(buf));
putenv(XtNewString(buf));
} else
p = getenv("DISPLAY");
if (p && *p)
@@ -286,7 +286,7 @@ int make_new_environ(oenv, sel)
ep = oenv->set = ALLOC(num + 2 + 1, EnvEnt);
for (i = 0; i < num && (p = setp[i]); i++)
if (strcmp(p, xmod) && strcmp(p, xinput)) {
if (strcmp(p, xmod) && (!xinput || strcmp(p, xinput))) {
ep->name = NEWSTR(p);
ep++;
}
@@ -335,7 +335,7 @@ int make_new_environ(oenv, sel)
}
# endif /* old_hpux */
for (i = 0; i < num && (p = unsetp[i]); i++) {
if (strcmp(p, xmod) == 0 || strcmp(p, xinput) == 0)
if (strcmp(p, xmod) == 0 || (xinput && strcmp(p, xinput)) == 0)
continue;
if (oenv->set) {
for (ep2 = oenv->set; ep2->name; ep2++)