projects
/
oweals
/
cde.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
313b4a8
)
SrvPalette.c: missed a merge conflict in SrvPalette.c
author
Jon Trulson
<jon@radscan.com>
Sun, 26 Jan 2020 19:22:09 +0000
(12:22 -0700)
committer
Jon Trulson
<jon@radscan.com>
Sun, 26 Jan 2020 19:22:09 +0000
(12:22 -0700)
cde/programs/dtsession/SrvPalette.c
patch
|
blob
|
history
diff --git
a/cde/programs/dtsession/SrvPalette.c
b/cde/programs/dtsession/SrvPalette.c
index f75b69296955091a68b4146ee1b0b438bf59fcfc..4d6ea8a276c0a24e426f65effe91f1c6cfb0a979 100644
(file)
--- a/
cde/programs/dtsession/SrvPalette.c
+++ b/
cde/programs/dtsession/SrvPalette.c
@@
-613,13
+613,6
@@
CheckMonitor(
(struct _palette *) SRV_MALLOC( sizeof(struct _palette) + 1 );
/* allocate enough space for the name */
(struct _palette *) SRV_MALLOC( sizeof(struct _palette) + 1 );
/* 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",
pColorSrvRsrc.MonochromePalette);
for (token1=tmpPalette; *token1; token1++)
snprintf(tmpPalette, SRVBUFSIZE, "%s",
pColorSrvRsrc.MonochromePalette);
for (token1=tmpPalette; *token1; token1++)
@@
-629,7
+622,6
@@
CheckMonitor(
if (!strcmp(token1, PALETTE_SUFFIX))
*token1 = '\0';
colorSrv.pCurrentPalette[screen_number]->name =
if (!strcmp(token1, PALETTE_SUFFIX))
*token1 = '\0';
colorSrv.pCurrentPalette[screen_number]->name =
->>>>>>> master
(char *)SRV_MALLOC(strlen(tmpPalette) + 1);
strcpy(colorSrv.pCurrentPalette[screen_number]->name,
(char *) tmpPalette);
(char *)SRV_MALLOC(strlen(tmpPalette) + 1);
strcpy(colorSrv.pCurrentPalette[screen_number]->name,
(char *) tmpPalette);