diff options
| author | oga <oga> | 2008-05-19 18:53:09 +0000 |
|---|---|---|
| committer | oga <oga> | 2008-05-19 18:53:09 +0000 |
| commit | 3bb0b451f78d13b4624e52b726f51e4847a84a2f (patch) | |
| tree | 4c640877a4c5129a3f2a9f2f30dbc3967e5588f9 /calmwm.c | |
| parent | 53116c4ec3792901d7ac774199963d915ea0da5a (diff) | |
| download | cwm-3bb0b451f78d13b4624e52b726f51e4847a84a2f.tar.gz cwm-3bb0b451f78d13b4624e52b726f51e4847a84a2f.tar.xz cwm-3bb0b451f78d13b4624e52b726f51e4847a84a2f.zip | |
General cleanup.
ok okan@.
Diffstat (limited to 'calmwm.c')
| -rw-r--r-- | calmwm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/calmwm.c b/calmwm.c index a9e84d9..582c10a 100644 --- a/calmwm.c +++ b/calmwm.c @@ -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 */ |