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

SrvPalette.c: missed a merge conflict in SrvPalette.c

Browse Source
This commit is contained in:
Jon Trulson
2020-01-26 12:22:09 -07:00
parent 313b4a8e0b
commit 04b2d175aa
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cde/programs/dtsession/SrvPalette.c
View File

@@ -613,13 +613,6 @@ CheckMonitor(
(struct _palette *) SRV_MALLOC( sizeof(struct _palette) + 1 ); (struct _palette *) SRV_MALLOC( sizeof(struct _palette) + 1 );
/* allocate enough space for the name */ /* allocate enough space for the name */
<<<<<<< HEAD
strcpy(tmpPalette, pColorSrvRsrc.MonochromePalette);
for (token1=tmpPalette; *token1; token1++);
while (token1!=tmpPalette && *token1!='.') token1--;
if (!strcmp(token1,PALETTE_SUFFIX)) *token1 = '\0';
colorSrv.pCurrentPalette[screen_number]->name =
=======
snprintf(tmpPalette, SRVBUFSIZE, "%s", snprintf(tmpPalette, SRVBUFSIZE, "%s",
pColorSrvRsrc.MonochromePalette); pColorSrvRsrc.MonochromePalette);
for (token1=tmpPalette; *token1; token1++) for (token1=tmpPalette; *token1; token1++)
@@ -629,7 +622,6 @@ CheckMonitor(
if (!strcmp(token1, PALETTE_SUFFIX)) if (!strcmp(token1, PALETTE_SUFFIX))
*token1 = '\0'; *token1 = '\0';
colorSrv.pCurrentPalette[screen_number]->name = colorSrv.pCurrentPalette[screen_number]->name =
>>>>>>> master
(char *)SRV_MALLOC(strlen(tmpPalette) + 1); (char *)SRV_MALLOC(strlen(tmpPalette) + 1);
strcpy(colorSrv.pCurrentPalette[screen_number]->name, strcpy(colorSrv.pCurrentPalette[screen_number]->name,
(char *) tmpPalette); (char *) tmpPalette);