aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraidan <aidan@Edward.localdomain>2020-08-19 10:10:43 -0600
committeraidan <aidan@Edward.localdomain>2020-08-19 10:10:43 -0600
commit416a36d63642b7261d347e29eb2b6cdddf8dba77 (patch)
tree1220da0fc466ac4e364bde344b09f75a954bdb24
parentb12722ab48277b9f960cdc0b0630564a610d5d0f (diff)
Unified style for if, for, and while statements. As well as general
code cleanup.
-rw-r--r--dwmblocks.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/dwmblocks.c b/dwmblocks.c
index e3ac034..5abd10d 100644
--- a/dwmblocks.c
+++ b/dwmblocks.c
@@ -68,7 +68,7 @@ void getcmd(const Block *block, char *output)
void getcmds(int time)
{
const Block* current;
- for(unsigned int i = 0; i < LENGTH(blocks); i++)
+ for (unsigned int i = 0; i < LENGTH(blocks); i++)
{
current = blocks + i;
if ((current->interval != 0 && time % current->interval == 0) || time == -1)
@@ -91,11 +91,11 @@ void setupsignals()
{
#ifndef __OpenBSD__
/* initialize all real time signals with dummy handler */
- for(int i = SIGRTMIN; i <= SIGRTMAX; i++)
+ for (int i = SIGRTMIN; i <= SIGRTMAX; i++)
signal(i, dummysighandler);
#endif
- for(unsigned int i = 0; i < LENGTH(blocks); i++)
+ for (unsigned int i = 0; i < LENGTH(blocks); i++)
{
if (blocks[i].signal > 0)
signal(SIGMINUS+blocks[i].signal, sighandler);
@@ -107,7 +107,7 @@ int getstatus(char *str, char *last)
{
strcpy(last, str);
str[0] = '\0';
- for(unsigned int i = 0; i < LENGTH(blocks); i++)
+ for (unsigned int i = 0; i < LENGTH(blocks); i++)
strcat(str, statusbar[i]);
str[strlen(str)-strlen(delim)] = '\0';
return strcmp(str, last);//0 if they are the same
@@ -141,12 +141,11 @@ void statusloop()
setupsignals();
int i = 0;
getcmds(-1);
- while(statusContinue)
+ while (statusContinue)
{
- getcmds(i);
+ getcmds(i++);
writestatus();
sleep(1.0);
- i++;
}
}
@@ -171,11 +170,11 @@ void termhandler()
int main(int argc, char** argv)
{
- for(int i = 0; i < argc; i++)
+ for (int i = 0; i < argc; i++) //Handle command line arguments
{
if (!strcmp("-d",argv[i]))
strncpy(delim, argv[++i], delimLen);
- else if(!strcmp("-p",argv[i]))
+ else if (!strcmp("-p",argv[i]))
writestatus = pstdout;
}
delim[MIN(delimLen, strlen(delim))] = '\0';