aboutsummaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
Diffstat (limited to 'unix')
-rw-r--r--unix/vncconfig/vncconfig.cxx14
-rw-r--r--unix/vncpasswd/vncpasswd.cxx2
-rw-r--r--unix/x0vncserver/x0vncserver.cxx6
-rw-r--r--unix/xserver/hw/vnc/vncExtInit.cc6
-rw-r--r--unix/xserver/hw/vnc/vncHooks.c4
-rw-r--r--unix/xserver/hw/vnc/xvnc.c4
6 files changed, 18 insertions, 18 deletions
diff --git a/unix/vncconfig/vncconfig.cxx b/unix/vncconfig/vncconfig.cxx
index d74d18a6..bacbfb3f 100644
--- a/unix/vncconfig/vncconfig.cxx
+++ b/unix/vncconfig/vncconfig.cxx
@@ -175,7 +175,7 @@ private:
static void usage()
{
- fprintf(stderr,"usage: %s [parameters]\n",
+ fprintf(stderr,"Usage: %s [parameters]\n",
programName);
fprintf(stderr," %s [parameters] -connect "
"[-view-only] <host>[:<port>]\n", programName);
@@ -248,11 +248,11 @@ int main(int argc, char** argv)
}
if (i >= argc) usage();
if (!XVncExtConnect(dpy, argv[i], viewOnly)) {
- fprintf(stderr,"connecting to %s failed\n",argv[i]);
+ fprintf(stderr, "Connecting to %s failed\n",argv[i]);
}
} else if (strcmp(argv[i], "-disconnect") == 0) {
if (!XVncExtConnect(dpy, "", False)) {
- fprintf(stderr,"disconnecting all clients failed\n");
+ fprintf(stderr, "Disconnecting all clients failed\n");
}
} else if (strcmp(argv[i], "-get") == 0) {
i++;
@@ -262,7 +262,7 @@ int main(int argc, char** argv)
if (XVncExtGetParam(dpy, argv[i], &data, &len)) {
printf("%.*s\n",len,data);
} else {
- fprintf(stderr,"getting param %s failed\n",argv[i]);
+ fprintf(stderr, "Getting param %s failed\n",argv[i]);
}
XFree(data);
} else if (strcmp(argv[i], "-desc") == 0) {
@@ -272,7 +272,7 @@ int main(int argc, char** argv)
if (desc) {
printf("%s\n",desc);
} else {
- fprintf(stderr,"getting description for param %s failed\n",argv[i]);
+ fprintf(stderr, "Getting description for param %s failed\n",argv[i]);
}
XFree(desc);
} else if (strcmp(argv[i], "-list") == 0) {
@@ -286,10 +286,10 @@ int main(int argc, char** argv)
i++;
if (i >= argc) usage();
if (!XVncExtSetParam(dpy, argv[i])) {
- fprintf(stderr,"setting param %s failed\n",argv[i]);
+ fprintf(stderr, "Setting param %s failed\n",argv[i]);
}
} else if (XVncExtSetParam(dpy, argv[i])) {
- fprintf(stderr,"set parameter %s\n",argv[i]);
+ fprintf(stderr, "Set parameter %s\n",argv[i]);
} else {
usage();
}
diff --git a/unix/vncpasswd/vncpasswd.cxx b/unix/vncpasswd/vncpasswd.cxx
index 9833ec7b..368bd40a 100644
--- a/unix/vncpasswd/vncpasswd.cxx
+++ b/unix/vncpasswd/vncpasswd.cxx
@@ -47,7 +47,7 @@ char* prog;
static void usage()
{
- fprintf(stderr,"usage: %s [file]\n", prog);
+ fprintf(stderr,"Usage: %s [file]\n", prog);
fprintf(stderr," %s -f\n", prog);
exit(1);
}
diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx
index f67bdcc9..7ea427ed 100644
--- a/unix/x0vncserver/x0vncserver.cxx
+++ b/unix/x0vncserver/x0vncserver.cxx
@@ -76,7 +76,7 @@ BoolParameter localhostOnly("localhost",
"Only allow connections from localhost",
false);
StringParameter interface("interface",
- "listen on the specified network address",
+ "Listen on the specified network address",
"all");
static const char* defaultDesktopName()
@@ -169,7 +169,7 @@ public:
bool verifyConnection(Socket* s) override
{
if (!reloadRules()) {
- vlog.error("Could not read IP filtering rules: rejecting all clients");
+ vlog.error("Could not read IP filtering rules, rejecting all clients");
filter.clear();
filter.push_back(parsePattern("-"));
return false;
@@ -310,7 +310,7 @@ int main(int argc, char** argv)
if (!(dpy = XOpenDisplay(displayname))) {
// FIXME: Why not vlog.error(...)?
- fprintf(stderr,"%s: unable to open display \"%s\"\r\n",
+ fprintf(stderr,"%s: Unable to open display \"%s\"\r\n",
programName, XDisplayName(displayname));
exit(1);
}
diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc
index 9b8cfe5b..367481ac 100644
--- a/unix/xserver/hw/vnc/vncExtInit.cc
+++ b/unix/xserver/hw/vnc/vncExtInit.cc
@@ -89,7 +89,7 @@ rfb::BoolParameter localhostOnly("localhost",
"Only allow connections from localhost",
false);
rfb::StringParameter interface("interface",
- "listen on the specified network address",
+ "Listen on the specified network address",
"all");
rfb::BoolParameter avoidShiftNumLock("AvoidShiftNumLock",
"Avoid fake Shift presses for keys affected by NumLock.",
@@ -173,13 +173,13 @@ static void parseOverrideList(const char *text, ParamSet &out)
void vncExtensionInit(void)
{
if (vncExtGeneration == vncGetServerGeneration()) {
- vlog.error("vncExtensionInit: called twice in same generation?");
+ vlog.error("vncExtensionInit: Called twice in same generation?");
return;
}
vncExtGeneration = vncGetServerGeneration();
if (vncGetScreenCount() > MAXSCREENS)
- vncFatalError("vncExtensionInit: too many screens\n");
+ vncFatalError("vncExtensionInit: Too many screens\n");
vncAddExtension();
diff --git a/unix/xserver/hw/vnc/vncHooks.c b/unix/xserver/hw/vnc/vncHooks.c
index 7fe35ada..bb15591f 100644
--- a/unix/xserver/hw/vnc/vncHooks.c
+++ b/unix/xserver/hw/vnc/vncHooks.c
@@ -436,7 +436,7 @@ static Bool vncHooksCloseScreen(ScreenPtr pScreen_)
unwrap(vncHooksScreen, rp, rrCrtcSet);
}
- DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n"));
+ DBGPRINT((stderr,"vncHooksCloseScreen: Unwrapped screen functions\n"));
return (*pScreen->CloseScreen)(pScreen);
}
@@ -1214,7 +1214,7 @@ static void vncHooksValidateGC(GCPtr pGC, unsigned long changes,
(*pGC->funcs->ValidateGC) (pGC, changes, pDrawable);
if (is_visible(pDrawable)) {
pGCPriv->ops = pGC->ops;
- DBGPRINT((stderr,"vncHooksValidateGC: wrapped GC ops\n"));
+ DBGPRINT((stderr,"vncHooksValidateGC: Wrapped GC ops\n"));
} else {
pGCPriv->ops = NULL;
}
diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
index 0165d598..31301f6c 100644
--- a/unix/xserver/hw/vnc/xvnc.c
+++ b/unix/xserver/hw/vnc/xvnc.c
@@ -374,7 +374,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
if ((vncInetdSock = dup(0)) == -1)
FatalError
- ("Xvnc error: failed to allocate a new file descriptor for -inetd: %s\n", strerror(errno));
+ ("Xvnc error: Failed to allocate a new file descriptor for -inetd: %s\n", strerror(errno));
/* Avoid xserver >= 1.19's epoll-fd becoming fd 2 / stderr only to be
@@ -396,7 +396,7 @@ ddxProcessArgument(int argc, char *argv[], int i)
if (displayNum == 100)
FatalError
- ("Xvnc error: no free display number for -inetd\n");
+ ("Xvnc error: No free display number for -inetd\n");
}
display = displayNumStr;