<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/43dedc0276a40b0cbb76a61d124222bc8457ada2">https://github.com/macports/macports-base/commit/43dedc0276a40b0cbb76a61d124222bc8457ada2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 43dedc027 daemondo/main.c: use static
</span>43dedc027 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 43dedc0276a40b0cbb76a61d124222bc8457ada2
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sun Oct 29 23:53:11 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> daemondo/main.c: use static
</span>---
src/programs/daemondo/main.c | 118 +++++++++++++++++++++----------------------
1 file changed, 59 insertions(+), 59 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/programs/daemondo/main.c b/src/programs/daemondo/main.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f81007ac..4925f8427 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/programs/daemondo/main.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/programs/daemondo/main.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,8 +70,8 @@
</span> #include <IOKit/IOMessage.h>
// Constants
<span style='display:block; white-space:pre;background:#ffe0e0;'>-const CFTimeInterval kChildDeathTimeout = 20.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-const CFTimeInterval kChildStartPidTimeout = 30.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static const CFTimeInterval kChildDeathTimeout = 20.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static const CFTimeInterval kChildStartPidTimeout = 30.0;
</span>
typedef enum {
kPidStyleUnknown = 0,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,40 +82,40 @@ typedef enum {
</span> } PidStyle;
// Globals
<span style='display:block; white-space:pre;background:#ffe0e0;'>-CFStringRef kProgramName = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CFStringRef kChildWatchMode = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static CFStringRef kProgramName = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static CFStringRef kChildWatchMode = NULL;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-int verbosity = 0; // Verbosity level
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-const char* label = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static int verbosity = 0; // Verbosity level
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static const char* label = NULL;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-const char* const* startArgs = NULL; // Argvs for start-cmd, stop-cmd, and restart-cmd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-const char* const* stopArgs = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-const char* const* restartArgs = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static const char* const* startArgs = NULL; // Argvs for start-cmd, stop-cmd, and restart-cmd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static const char* const* stopArgs = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static const char* const* restartArgs = NULL;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PidStyle pidStyle = kPidStyleUnknown;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-const char* pidFile = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static PidStyle pidStyle = kPidStyleUnknown;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static const char* pidFile = NULL;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-int terminating = 0; // TRUE if we're terminating
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pid_t runningPid = 0; // Current running pid (0 while stopped, -1 if we don't know pid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static int terminating = 0; // TRUE if we're terminating
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static pid_t runningPid = 0; // Current running pid (0 while stopped, -1 if we don't know pid)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-int kqfd = 0; // Kqueue file descriptor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static int kqfd = 0; // Kqueue file descriptor
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-mach_port_t sigChild_m_port = 0; // Mach port to send signals through
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-mach_port_t sigGeneric_m_port = 0; // Mach port to send signals through
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static mach_port_t sigChild_m_port = 0; // Mach port to send signals through
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static mach_port_t sigGeneric_m_port = 0; // Mach port to send signals through
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-CFMutableArrayRef scRestartPatterns = NULL; // Array of sc patterns to restart daemon on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CFMutableArrayRef distNotifyNames = NULL; // Array of distributed notification names to restart daemon on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CFMutableArrayRef darwinNotifyNames = NULL; // Array of darwin notification names to restart daemon on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static CFMutableArrayRef scRestartPatterns = NULL; // Array of sc patterns to restart daemon on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static CFMutableArrayRef distNotifyNames = NULL; // Array of distributed notification names to restart daemon on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static CFMutableArrayRef darwinNotifyNames = NULL; // Array of darwin notification names to restart daemon on
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-io_connect_t pwrRootPort = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-int restartOnWakeup = 0; // TRUE to restart daemon on wake from sleep
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CFRunLoopTimerRef restartTimer = NULL; // Timer for scheduled restart
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CFTimeInterval restartHysteresis = 5.0; // Default hysteresis is 5 seconds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-int restartWait = 3; // Default wait during restart is 3 seconds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static io_connect_t pwrRootPort = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static int restartOnWakeup = 0; // TRUE to restart daemon on wake from sleep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static CFRunLoopTimerRef restartTimer = NULL; // Timer for scheduled restart
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static CFTimeInterval restartHysteresis = 5.0; // Default hysteresis is 5 seconds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static int restartWait = 3; // Default wait during restart is 3 seconds
</span>
__printflike(1, 2)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> LogMessage(const char* fmt, ...)
{
struct tm tm;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,7 +140,7 @@ LogMessage(const char* fmt, ...)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-const char*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static const char*
</span> CatArray(const char* const* strarray, char* buf, size_t size)
{
const char* sep = " ";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,14 +157,14 @@ CatArray(const char* const* strarray, char* buf, size_t size)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> DoVersion(void)
{
printf("daemondo, version 1.1\n\n");
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> DoHelp(void)
{
DoVersion();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -256,7 +256,7 @@ DoHelp(void)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> CreatePidFile(void)
{
// Write a pid file if we're expected to
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -282,7 +282,7 @@ CreatePidFile(void)
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> DestroyPidFile(void)
{
// Cleanup the pid file
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -309,7 +309,7 @@ DestroyPidFile(void)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pid_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static pid_t
</span> CheckForValidPidFile(void)
{
// Try to read the pid from the pid file
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -332,7 +332,7 @@ CheckForValidPidFile(void)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pid_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static pid_t
</span> DeletePreexistingPidFile(void)
{
// Try to read the pid from the pid file
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -371,7 +371,7 @@ DeletePreexistingPidFile(void)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pid_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static pid_t
</span> WaitForValidPidFile(void)
{
CFAbsoluteTime patience = CFAbsoluteTimeGetCurrent() + kChildStartPidTimeout;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -389,7 +389,7 @@ WaitForValidPidFile(void)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> MonitorChild(pid_t childPid)
{
runningPid = childPid;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -407,21 +407,21 @@ MonitorChild(pid_t childPid)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> UnmonitorChild(void)
{
runningPid = 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static int
</span> MonitoringChild(void)
{
return runningPid != 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> ProcessChildDeath(pid_t childPid)
{
// Take special note if process runningPid dies
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -438,7 +438,7 @@ ProcessChildDeath(pid_t childPid)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> WaitChildDeath(pid_t childPid)
{
// Wait for the death of a particular child
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -476,7 +476,7 @@ WaitChildDeath(pid_t childPid)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> CheckChildren(void)
{
// Process any pending child deaths
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -487,7 +487,7 @@ CheckChildren(void)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pid_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static pid_t
</span> Exec(const char* const argv[], int sync)
{
if (!argv || !argv[0] || !*argv[0])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -535,7 +535,7 @@ Exec(const char* const argv[], int sync)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static int
</span> Start(void)
{
char buf[1024];
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -608,7 +608,7 @@ Start(void)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static int
</span> Stop(void)
{
char buf[1024];
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -662,7 +662,7 @@ Stop(void)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static int
</span> Restart(void)
{
char buf[1024];
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -709,7 +709,7 @@ Restart(void)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> ScheduledRestartCallback(CFRunLoopTimerRef timer UNUSED, void *info UNUSED)
{
if (verbosity >= 3)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -720,7 +720,7 @@ ScheduledRestartCallback(CFRunLoopTimerRef timer UNUSED, void *info UNUSED)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> CancelScheduledRestart(void)
{
// Kill off any existing timer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -734,7 +734,7 @@ CancelScheduledRestart(void)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> ScheduleRestartForTime(CFAbsoluteTime absoluteTime)
{
// Cancel any currently scheduled restart
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -747,7 +747,7 @@ ScheduleRestartForTime(CFAbsoluteTime absoluteTime)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> ScheduleDelayedRestart(void)
{
// The hysteresis here allows us to take multiple restart requests within a small
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -760,7 +760,7 @@ ScheduleDelayedRestart(void)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> DynamicStoreChanged(
SCDynamicStoreRef store UNUSED,
CFArrayRef changedKeys,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -791,7 +791,7 @@ DynamicStoreChanged(
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> PowerCallBack(void *x UNUSED, io_service_t y UNUSED, natural_t messageType, void *messageArgument)
{
switch (messageType)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -815,7 +815,7 @@ PowerCallBack(void *x UNUSED, io_service_t y UNUSED, natural_t messageType, void
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> NotificationCenterCallback(
CFNotificationCenterRef center UNUSED,
void *observer UNUSED,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -834,7 +834,7 @@ NotificationCenterCallback(
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> SignalCallback(CFMachPortRef port UNUSED, void *msg, CFIndex size UNUSED, void *info UNUSED)
{
mach_msg_header_t* hdr = (mach_msg_header_t*)msg;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -868,7 +868,7 @@ SignalCallback(CFMachPortRef port UNUSED, void *msg, CFIndex size UNUSED, void *
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void KQueueCallBack (CFSocketRef socketRef, CFSocketCallBackType type UNUSED,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void KQueueCallBack (CFSocketRef socketRef, CFSocketCallBackType type UNUSED,
</span> CFDataRef address UNUSED, const void *data UNUSED, void *context UNUSED)
{
int fd = CFSocketGetNative(socketRef);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -894,7 +894,7 @@ void KQueueCallBack (CFSocketRef socketRef, CFSocketCallBackType type UNUSED,
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> AddNotificationToCenter(const void* value, void* context)
{
CFNotificationCenterAddObserver((CFNotificationCenterRef)context,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -906,7 +906,7 @@ AddNotificationToCenter(const void* value, void* context)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void handle_child_signal(int sig)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void handle_child_signal(int sig)
</span> {
// Because there's a limited environment in which we can operate while
// handling a signal, we send a mach message to our run loop, and handle
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -926,7 +926,7 @@ void handle_child_signal(int sig)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void handle_generic_signal(int sig)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void handle_generic_signal(int sig)
</span> {
// Because there's a limited environment in which we can operate while
// handling a signal, we send a mach message to our run loop, and handle
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -946,7 +946,7 @@ void handle_generic_signal(int sig)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static int
</span> MainLoop(void)
{
// *** TODO: This routine needs more error checking
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1084,7 +1084,7 @@ MainLoop(void)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static int
</span> CollectCmdArgs(char* arg1, int argc, char* const argv[], const char * const ** args)
{
// Count the number of additional arguments up until end of args or the marker argument ";"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1115,7 +1115,7 @@ CollectCmdArgs(char* arg1, int argc, char* const argv[], const char * const ** a
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static void
</span> AddSingleArrayArg(const char* arg, CFMutableArrayRef array)
{
CFStringRef s = CFStringCreateWithCString(NULL, arg, kCFStringEncodingUTF8);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1124,7 +1124,7 @@ AddSingleArrayArg(const char* arg, CFMutableArrayRef array)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+static int
</span> CollectArrayArgs(char* arg1, int argc, char* const argv[], CFMutableArrayRef array)
{
// Let CollectCmdArgs do the grunt work
</pre><pre style='margin:0'>
</pre>