This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
The following commit(s) were added to refs/heads/master by this push:
new 74ae6c9 (doc) Fix typos in javadoc and comments (#51)
74ae6c9 is described below
commit 74ae6c985da4dd0c1a333f13e72d016c79d8e0d8
Author: Marc Wrobel <[email protected]>
AuthorDate: Sat Jul 16 02:03:33 2022 +0200
(doc) Fix typos in javadoc and comments (#51)
Fix minor typos in javadoc and comments.
---
src/main/java/org/apache/commons/daemon/DaemonPermission.java | 8 ++++----
src/native/unix/INSTALL.txt | 4 ++--
src/native/unix/native/arguments.h | 6 +++---
src/native/unix/native/debug.c | 6 +++---
src/native/unix/native/debug.h | 6 +++---
src/native/unix/native/dso-dlfcn.c | 2 +-
src/native/unix/native/dso-dyld.c | 2 +-
src/native/unix/native/signals.c | 4 ++--
src/native/windows/apps/prunmgr/prunmgr.c | 4 ++--
src/native/windows/apps/prunsrv/prunsrv.c | 2 +-
src/native/windows/include/cmdline.h | 2 +-
src/native/windows/include/handles.h | 2 +-
src/native/windows/src/cmdline.c | 4 ++--
src/native/windows/src/console.c | 4 ++--
src/native/windows/src/handles.c | 4 ++--
src/native/windows/src/javajni.c | 4 ++--
src/native/windows/src/private.h | 2 +-
src/native/windows/src/registry.c | 4 ++--
src/native/windows/src/rprocess.c | 2 +-
src/native/windows/src/service.c | 4 ++--
src/test/java/org/apache/commons/daemon/SimpleDaemon.java | 2 +-
21 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/src/main/java/org/apache/commons/daemon/DaemonPermission.java
b/src/main/java/org/apache/commons/daemon/DaemonPermission.java
index bc5a3b7..1530331 100644
--- a/src/main/java/org/apache/commons/daemon/DaemonPermission.java
+++ b/src/main/java/org/apache/commons/daemon/DaemonPermission.java
@@ -184,7 +184,7 @@ public final class DaemonPermission extends Permission
public DaemonPermission(final String target)
throws IllegalArgumentException
{
- // Setup the target name of this permission object.
+ // Set up the target name of this permission object.
super(target);
// Check if the permission target name was specified
@@ -259,7 +259,7 @@ public final class DaemonPermission extends Permission
/**
* Checks if a specified object equals {@code DaemonPermission}.
*
- * @return <b>true</b> or <b>false</b> wether the specified object equals
+ * @return <b>true</b> or <b>false</b> whether the specified object equals
* this {@code DaemonPermission} instance or not.
*/
@Override
@@ -285,7 +285,7 @@ public final class DaemonPermission extends Permission
* Checks if this {@code DaemonPermission} implies another
* {@code Permission}.
*
- * @return <b>true</b> or <b>false</b> wether the specified permission
+ * @return <b>true</b> or <b>false</b> whether the specified permission
* is implied by this {@code DaemonPermission} instance or
* not.
*/
@@ -392,7 +392,7 @@ public final class DaemonPermission extends Permission
return mask;
}
- /** Creates a actions list for a given control permission mask. */
+ /** Creates an actions list for a given control permission mask. */
private String createControlActions(final int mask)
{
final StringBuilder buf = new StringBuilder();
diff --git a/src/native/unix/INSTALL.txt b/src/native/unix/INSTALL.txt
index 2cc66c9..a51d794 100644
--- a/src/native/unix/INSTALL.txt
+++ b/src/native/unix/INSTALL.txt
@@ -12,7 +12,7 @@ When building from Git you need to build the "configure"
program with:
Once the configure script is generated, run it (remember to specify
either the --with-java=<dir> parameter or set the JAVA_HOME environment
-to point to your JDK installation. For example:
+to point to your JDK installation). For example:
./configure --with-java=/usr/java
@@ -30,7 +30,7 @@ machine dependant include file (jni_md.h). If that's the case
use the
within JDK include directory containing jni_md.h file.
-If your operating system is supported, configure will go thru cleanly,
+If your operating system is supported, configure will go through cleanly,
otherwise it will report an error (please send us the details of your
OS/JDK, or a patch against the sources).
diff --git a/src/native/unix/native/arguments.h
b/src/native/unix/native/arguments.h
index 92e090a..f8fd4a7 100644
--- a/src/native/unix/native/arguments.h
+++ b/src/native/unix/native/arguments.h
@@ -46,13 +46,13 @@ typedef struct {
char **args;
/** Number of class command line arguments. */
int anum;
- /** Wether to detach from parent process or not. */
+ /** Whether to detach from parent process or not. */
bool dtch;
- /** Wether to print the VM version number or not. */
+ /** Whether to print the VM version number or not. */
bool vers;
/** Show the VM version and continue. */
bool vershow;
- /** Wether to display the help page or not. */
+ /** Whether to display the help page or not. */
bool help;
/** Only check environment without running the service. */
bool chck;
diff --git a/src/native/unix/native/debug.c b/src/native/unix/native/debug.c
index b00d32f..8853c1d 100644
--- a/src/native/unix/native/debug.c
+++ b/src/native/unix/native/debug.c
@@ -19,13 +19,13 @@
#include <unistd.h>
#include <time.h>
-/* Wether debug is enabled or not */
+/* Whether debug is enabled or not */
bool log_debug_flag = false;
-/* Wether SYSLOG logging (for stderr) is enable or not. */
+/* Whether SYSLOG logging (for stderr) is enable or not. */
bool log_stderr_syslog_flag = false;
-/* Wether SYSLOG logging (for stdout) is enable or not. */
+/* Whether SYSLOG logging (for stdout) is enable or not. */
bool log_stdout_syslog_flag = false;
/* The name of the jsvc binary. */
diff --git a/src/native/unix/native/debug.h b/src/native/unix/native/debug.h
index 612607b..fff2041 100644
--- a/src/native/unix/native/debug.h
+++ b/src/native/unix/native/debug.h
@@ -21,14 +21,14 @@
extern "C" {
#endif
/**
- * Wether debugging is enabled or not.
+ * Whether debugging is enabled or not.
*/
extern bool log_debug_flag;
-/* Wether SYSLOG logging (for stderr) is enable or not. */
+/* Whether SYSLOG logging (for stderr) is enable or not. */
extern bool log_stderr_syslog_flag;
-/* Wether SYSLOG logging (for stdout) is enable or not. */
+/* Whether SYSLOG logging (for stdout) is enable or not. */
extern bool log_stdout_syslog_flag;
/**
diff --git a/src/native/unix/native/dso-dlfcn.c
b/src/native/unix/native/dso-dlfcn.c
index 5ee58ae..bb365d2 100644
--- a/src/native/unix/native/dso-dlfcn.c
+++ b/src/native/unix/native/dso-dlfcn.c
@@ -45,7 +45,7 @@ bool dso_unlink(dso_handle libr)
return false;
}
-/* Get the address for a specifed symbol */
+/* Get the address for a specified symbol */
void *dso_symbol(dso_handle hdl, const char *nam)
{
return dlsym(hdl, nam);
diff --git a/src/native/unix/native/dso-dyld.c
b/src/native/unix/native/dso-dyld.c
index 3b3a3bd..49f201f 100644
--- a/src/native/unix/native/dso-dyld.c
+++ b/src/native/unix/native/dso-dyld.c
@@ -96,7 +96,7 @@ bool dso_unlink(dso_handle libr)
return (true);
}
-/* Get the address for a specifed symbol */
+/* Get the address for a specified symbol */
void *dso_symbol(dso_handle hdl, const char *nam)
{
NSSymbol sym = NULL;
diff --git a/src/native/unix/native/signals.c b/src/native/unix/native/signals.c
index 209cfda..b740556 100644
--- a/src/native/unix/native/signals.c
+++ b/src/native/unix/native/signals.c
@@ -62,8 +62,8 @@ int SetTerm(void (*func) (void))
/*
* event cannot be inherited.
- * the event is reseted to nonsignaled after the waiting thread is
released.
- * the start state is resetted.
+ * the event is reset to nonsignaled after the waiting thread is released.
+ * the start state is reset.
*/
/* Initialize the new security descriptor. */
diff --git a/src/native/windows/apps/prunmgr/prunmgr.c
b/src/native/windows/apps/prunmgr/prunmgr.c
index 0c5e85d..12eb506 100644
--- a/src/native/windows/apps/prunmgr/prunmgr.c
+++ b/src/native/windows/apps/prunmgr/prunmgr.c
@@ -84,7 +84,7 @@ static LPCWSTR _s_stop = L"Stop";
static LPCWSTR _commands[] = {
L"ES", /* 1 Manage Service (default)*/
L"MS", /* 2 Monitor Service */
- L"MR", /* 3 Monitor Service and start if not runing */
+ L"MR", /* 3 Monitor Service and start if not running */
L"MQ", /* 4 Quit all running Monitor applications */
NULL
};
@@ -92,7 +92,7 @@ static LPCWSTR _commands[] = {
static LPCWSTR _altcmds[] = {
L"manage", /* 1 Manage Service (default)*/
L"monitor", /* 2 Monitor Service */
- L"start", /* 3 Monitor Service and start if not runing */
+ L"start", /* 3 Monitor Service and start if not running */
L"quit", /* 4 Quit all running Monitor applications */
NULL
};
diff --git a/src/native/windows/apps/prunsrv/prunsrv.c
b/src/native/windows/apps/prunsrv/prunsrv.c
index fea2682..56663b0 100644
--- a/src/native/windows/apps/prunsrv/prunsrv.c
+++ b/src/native/windows/apps/prunsrv/prunsrv.c
@@ -404,7 +404,7 @@ static void printVersion(void)
L"<URL:https://issues.apache.org/jira/browse/DAEMON>.");
}
-/* Displays comamnd line parameters. */
+/* Displays command line parameters. */
static void dumpCmdline()
{
int i = 0;
diff --git a/src/native/windows/include/cmdline.h
b/src/native/windows/include/cmdline.h
index 0d5af19..a8cf30f 100644
--- a/src/native/windows/include/cmdline.h
+++ b/src/native/windows/include/cmdline.h
@@ -40,7 +40,7 @@ struct APXCMDLINEOPT {
LPWSTR szName; /* Long Argument Name */
LPWSTR szRegistry; /* Registry Association */
LPWSTR szSubkey; /* Registry Association */
- DWORD dwType; /* Argument type (string, number,
multistring */
+ DWORD dwType; /* Argument type (string, number,
multi-string */
LPWSTR szValue; /* Return string value */
DWORD dwValue; /* Return numeric value or present if NIL
*/
};
diff --git a/src/native/windows/include/handles.h
b/src/native/windows/include/handles.h
index 92f60ce..91446ca 100644
--- a/src/native/windows/include/handles.h
+++ b/src/native/windows/include/handles.h
@@ -126,7 +126,7 @@ BOOL apxHandleSendMessage(APXHANDLE hObject, UINT
uMsg,
WPARAM wParam, LPARAM lParam);
/** Post the message to the handle
- * function returns imediately.
+ * function returns immediately.
*/
BOOL apxHandlePostMessage(APXHANDLE hObject, UINT uMsg,
WPARAM wParam, LPARAM lParam);
diff --git a/src/native/windows/src/cmdline.c b/src/native/windows/src/cmdline.c
index 023e42b..a22d314 100644
--- a/src/native/windows/src/cmdline.c
+++ b/src/native/windows/src/cmdline.c
@@ -255,10 +255,10 @@ void apxCmdlineFree(
/*
* Environment variables parsing
- * Each variable is prfixed with PR_
+ * Each variable is prefixed with PR_
* for example 'set PR_JVM=auto' has a same meaning as providing '--Jvm auto'
* on the command line.
- * Multistring variables are added to the present conf.
+ * Multi-string variables are added to the present conf.
*/
void apxCmdlineLoadEnvVars(
LPAPXCMDLINE lpCmdline)
diff --git a/src/native/windows/src/console.c b/src/native/windows/src/console.c
index 6aeaf2b..1d3fedb 100644
--- a/src/native/windows/src/console.c
+++ b/src/native/windows/src/console.c
@@ -39,7 +39,7 @@ typedef struct stAPXCONSOLE_LAYOUT {
COLORREF clrText;
/** Selected text background color */
COLORREF clrSelectBackground;
- /** Selected rext color */
+ /** Selected text color */
COLORREF clrSelectText;
/** Character size */
POINT ptCharSize;
@@ -49,7 +49,7 @@ typedef struct stAPXCONSOLE_LAYOUT {
INT nFontSize;
/** Caret size */
POINT ptCaretSize;
- /** Caret Bilnk time in ms */
+ /** Caret blink time in ms */
UINT nCaretBlinkTime;
/** Typeface name of the font (32 char max including the null terminator)
*/
TCHAR szFontName[32];
diff --git a/src/native/windows/src/handles.c b/src/native/windows/src/handles.c
index 0a9527a..953152f 100644
--- a/src/native/windows/src/handles.c
+++ b/src/native/windows/src/handles.c
@@ -229,7 +229,7 @@ static BOOL __apxHandleCallback(APXHANDLE hObject, UINT
uMsg,
if (dwState == WAIT_TIMEOUT)
TerminateThread(hObject->hEventThread, 0);
SAFE_CLOSE_HANDLE(hObject->hEventThread);
- /* Reset the evant flag */
+ /* Reset the event flag */
hObject->dwFlags &= ~APXHANDLE_HAS_EVENT;
}
return rv;
@@ -519,7 +519,7 @@ apxCloseHandle(APXHANDLE hObject)
hObject->dwFlags &= ~APXHANDLE_HAS_EVENT;
}
- /* finaly remove the object from the pool's object list */
+ /* finally remove the object from the pool's object list */
if (!IS_INVALID_HANDLE(hObject->hPool)) {
lpPool = APXHANDLE_DATA(hObject->hPool);
APXHANDLE_SPINLOCK(hObject->hPool);
diff --git a/src/native/windows/src/javajni.c b/src/native/windows/src/javajni.c
index acc64c7..12a26ae 100644
--- a/src/native/windows/src/javajni.c
+++ b/src/native/windows/src/javajni.c
@@ -355,7 +355,7 @@ static BOOL __apxLoadJvmDll(APXHANDLE hPool, LPCWSTR
szJvmDllPath, LPCWSTR szJav
return FALSE;
}
- /* Real voodo ... */
+ /* Real voodoo ... */
return TRUE;
}
@@ -693,7 +693,7 @@ static LPSTR __apxEvalClasspath(APXHANDLE hPool, LPCSTR
szCp)
else
pGcp = __apxStrnCatA(hPool, NULL, JAVA_CLASSPATH, NULL);
if (end > 0 && pPtr[end - 1] == '*') {
- /* Last path elemet ends with star
+ /* Last path element ends with star
* Do a globbing.
*/
pGcp = __apxEvalPathPart(hPool, pGcp, pPtr);
diff --git a/src/native/windows/src/private.h b/src/native/windows/src/private.h
index 6f64dd6..f4bcc2c 100644
--- a/src/native/windows/src/private.h
+++ b/src/native/windows/src/private.h
@@ -214,7 +214,7 @@ struct stAPXHANDLE {
DWORD hEventThreadId;
/** private local heap */
HANDLE hHeap;
- /** list enty for pool */
+ /** list entry for pool */
TAILQ_ENTRY(stAPXHANDLE) queue;
/** small userdata pointer */
union {
diff --git a/src/native/windows/src/registry.c
b/src/native/windows/src/registry.c
index f4bead5..89ff554 100644
--- a/src/native/windows/src/registry.c
+++ b/src/native/windows/src/registry.c
@@ -83,12 +83,12 @@ struct APXREGISTRY {
HKEY hServKey; /* service key */
HKEY hUserKey; /* user key */
HKEY hCurrKey; /* Current opened key */
- LPVOID pCurrVal; /* Current value, overwitten on a next call */
+ LPVOID pCurrVal; /* Current value, overwritten on a next call */
HKEY hRparamKey; /* root\\Parameters */
HKEY hSparamKey; /* service\\Parameters */
HKEY hUparamKey; /* service\\Parameters */
REGSAM samOptions;
- /** list enty for opened subkeys */
+ /** list entry for opened subkeys */
TAILQ_HEAD(_lSubkeys, APXREGSUBKEY) lSubkeys;
};
diff --git a/src/native/windows/src/rprocess.c
b/src/native/windows/src/rprocess.c
index dec464c..6857a3d 100644
--- a/src/native/windows/src/rprocess.c
+++ b/src/native/windows/src/rprocess.c
@@ -842,7 +842,7 @@ static LPWSTR __apxStrQuote(LPWSTR lpDest, LPCWSTR szSrc)
LPWSTR p;
BOOL space = FALSE, quote = FALSE;
- /* Find if string has embeded spaces, add quotes only if no quotes found
+ /* Find if string has embedded spaces, add quotes only if no quotes found
*/
for (p = (LPWSTR)szSrc; *p; p++) {
if (*p == L' ' || *p == '\t') {
diff --git a/src/native/windows/src/service.c b/src/native/windows/src/service.c
index 69acabb..e5c371d 100644
--- a/src/native/windows/src/service.c
+++ b/src/native/windows/src/service.c
@@ -565,7 +565,7 @@ apxServiceControl(APXHANDLE hService, DWORD dwControl, UINT
uMsg,
break;
}
}
- /* signal that we are done with controling the service */
+ /* signal that we are done with controlling the service */
if (fnControlCallback)
(*fnControlCallback)(lpCbData, uMsg, (WPARAM)3, (LPARAM)0);
/* Check if we are in the desired state */
@@ -603,7 +603,7 @@ apxServiceControl(APXHANDLE hService, DWORD dwControl, UINT
uMsg,
return FALSE;
}
-/* Wait one second and check that the service has stopped, returns TRUE if
stopped FASE otherwise */
+/* Wait one second and check that the service has stopped, returns TRUE if
stopped FALSE otherwise */
BOOL
apxServiceCheckStop(APXHANDLE hService)
{
diff --git a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
index 5226965..411bcda 100644
--- a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
+++ b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
@@ -263,7 +263,7 @@ public class SimpleDaemon implements Daemon, Runnable,
DaemonUserSignal {
case -1:
return;
- /* Attempt to shutdown */
+ /* Attempt to shut down */
case '1':
out.println("Attempting a shutdown...");
try {
