NapoleonDynamite/dwmblocks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed garbled last commit

Browse source
This commit is contained in:
Aidan Hubert 2019-11-27 05:50:38 +00:00
parent 1766af7d5e
commit b685f2805f
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dwmblocks.c
View file

@ -33,10 +33,7 @@ static Window root;
static char statusbar[LENGTH(blocks)][50] = {0}; static char statusbar[LENGTH(blocks)][50] = {0};
static char statusstr[2][256]; static char statusstr[2][256];
static int statusContinue = 1; static int statusContinue = 1;
<<<<<<< HEAD
static void (*writestatus) () = setroot; static void (*writestatus) () = setroot;
=======
>>>>>>> 5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48
void replace(char *str, char old, char new) void replace(char *str, char old, char new)
{ {
@ -99,21 +96,12 @@ void setupsignals()
int getstatus(char *str, char *last) int getstatus(char *str, char *last)
{ {
strcpy(last, str); strcpy(last, str);
<<<<<<< HEAD
str[0] = '\0'; str[0] = '\0';
for(int i = 0; i < LENGTH(blocks); i++) for(int i = 0; i < LENGTH(blocks); i++)
=======
int j = 0;
for(int i = 0; i < LENGTH(blocks); j+=strlen(statusbar[i++]))
>>>>>>> 5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48
{ {
strcat(str, statusbar[i]); strcat(str, statusbar[i]);
} }
<<<<<<< HEAD
str[strlen(str)-1] = '\0'; str[strlen(str)-1] = '\0';
=======
str[--j] = '\0';
>>>>>>> 5ff59d4e8ba9c64963d36c8ea51e7a1d644aef48
return strcmp(str, last);//0 if they are the same return strcmp(str, last);//0 if they are the same
} }