Skip to content

Commit

Permalink
Revert "don't know why it has to be this way"
Browse files Browse the repository at this point in the history
This reverts commit 72c9b74.

It doesn't have to be this way.
  • Loading branch information
bbidulock committed Dec 9, 2021
1 parent f888fef commit 8c10112
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/adwm.c
Original file line number Diff line number Diff line change
Expand Up @@ -6792,10 +6792,10 @@ xerror(Display *dsply, XErrorEvent *ee)
EPRINTF("\tFailed request %lu\n", ee->serial);
if (trap)
EPRINTF("\tNext request trap %lu\n", trap->trap_next);
EPRINTF("\tNext request now %lu\n", NextRequest(dsply));
EPRINTF("\tNext request now %lu\n", NextRequest(dsply));
if (trap)
EPRINTF("\tLast known processed request trap %lu\n", trap->trap_last);
EPRINTF("\tLast known processed request now %lu\n", LastKnownRequestProcessed(dsply));
EPRINTF("\tLast known processed request now %lu\n", LastKnownRequestProcessed(dsply));
if (critical || ignore)
dumpstack(__FILE__, __LINE__, __func__);
if (!critical || ignore) {
Expand Down Expand Up @@ -7022,7 +7022,7 @@ main(int argc, char *argv[])
case 0:
goto bad_usage;
case 'f': /* -f, --file {PATH/}FILE */
snprintf(conf, sizeof(conf) - 1, optarg);
strncpy(conf, optarg, sizeof(conf) - 1);
break;
case 'c': /* -c, --clientId ID */
free(clientid);
Expand Down
2 changes: 1 addition & 1 deletion src/adwm_adwm.c
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ inittags_ADWM(Bool reload)
snprintf(name, sizeof(name), "adwm.screen%u.tags.name%u", s, i);
snprintf(clas, sizeof(clas), "Adwm.Screen%u.Tags.Name%u", s, i);
res = readres(name, clas, def);
snprintf(t->name, sizeof(t->name), res);
strncpy(t->name, res, sizeof(t->name) - 1);
}
scr->ntags = scr->options.ntags;

Expand Down
2 changes: 1 addition & 1 deletion src/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ inittags(Bool reload __attribute__((unused)))
snprintf(def, sizeof(def), " %u ", i + 1);
snprintf(resource, sizeof(resource), "tags.name%u", i);
res = getscreenres(resource, def);
snprintf(t->name, sizeof(t->name), res);
strncpy(t->name, res, sizeof(t->name) - 1);
XPRINTF("initialized tag %u to %s\n", i, res);
}
scr->ntags = scr->options.ntags;
Expand Down

0 comments on commit 8c10112

Please sign in to comment.