mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

General cleanup.

Browse Source 
ok okan@.
This commit is contained in:
oga 2008-05-19 18:53:09 +00:00
parent 53116c4ec3
commit 3bb0b451f7
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calmwm.c
View File

@ -52,14 +52,14 @@ int
main(int argc, char **argv)
{
int ch;
const char *conffile = NULL;
const char *conf_file = NULL;
char *display_name = NULL;
while ((ch = getopt(argc, argv, "c:d:")) != -1) {
switch (ch) {
case 'c':
conffile = optarg;
conf_file = optarg;
break;
case 'd':
display_name = optarg;
@ -82,7 +82,7 @@ main(int argc, char **argv)
Starting = 1;
bzero(&Conf, sizeof(Conf));
conf_setup(&Conf, conffile);
conf_setup(&Conf, conf_file);
client_setup();
x_setup(display_name);
Starting = 0;
@ -238,7 +238,7 @@ x_setupscreen(struct screen_ctx *sc, u_int which)
LeaveWindowMask|ColormapChangeMask|ButtonMask;
XChangeWindowAttributes(X_Dpy, sc->rootwin,
/* CWCursor| */CWEventMask, &rootattr);
CWEventMask, &rootattr);
XSync(X_Dpy, False);
@ -257,10 +257,10 @@ x_screenname(int which)
dstr = xstrdup(DisplayString(X_Dpy));
if ((cp = rindex(dstr, ':')) == NULL)
if ((cp = strrchr(dstr, ':')) == NULL)
return (NULL);
if ((cp = index(cp, '.')) != NULL)
if ((cp = strchr(cp, '.')) != NULL)
*cp = '\0';
snlen = strlen(dstr) + 3; /* string, dot, number, null */

6
conf.c
View File

@ -157,9 +157,9 @@ conf_init(struct conf *c)
}
void
conf_setup(struct conf *c, const char *conffile)
conf_setup(struct conf *c, const char *conf_file)
{
if (conffile == NULL) {
if (conf_file == NULL) {
char *home = getenv("HOME");
if (home == NULL)
@ -168,7 +168,7 @@ conf_setup(struct conf *c, const char *conffile)
snprintf(c->conf_path, sizeof(c->conf_path), "%s/%s", home,
CONFFILE);
} else
snprintf(c->conf_path, sizeof(c->conf_path), "%s", conffile);
snprintf(c->conf_path, sizeof(c->conf_path), "%s", conf_file);
conf_init(c);