diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-09-01 16:24:41 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-09-01 16:24:41 -0700 |
| commit | c36029fc806cf083de3aaf1344d6bd2be8db316f (patch) | |
| tree | da88b1f073b8125d764b94b924492d2b05ea4c69 /src/main.c | |
| parent | aa0755f53545fcf343f791f04760f6b934e022e4 (diff) | |
| parent | 6982a829e22d2bc7cf7c829c4430a4ea6f5bc7fa (diff) | |
| download | mpd-c36029fc806cf083de3aaf1344d6bd2be8db316f.tar.gz mpd-c36029fc806cf083de3aaf1344d6bd2be8db316f.tar.xz mpd-c36029fc806cf083de3aaf1344d6bd2be8db316f.zip | |
Merge branch 'mk/cleanups'
* mk/cleanups: (60 commits)
pass constant pointers
const pointers
unsigned integers and size_t
oggflac: fix GCC warnings
include cleanup
protect locate.h from double inclusion
playlist: eliminate unused fd parameters
jack: made "sample_size" static const
moved jack configuration to the JackData struct
jack: removed unused macros
jack: don't set audioOutput->data=NULL
jack: initialize JackData in jack_initDriver()
jack: added freeJackClient()
jack: initialize jd->client after !jd check
jack: eliminate superfluous freeJackData() calls
mp3: converted the MUTEFRAME_ macros to an enum
mp3: converted the DECODE_ constants to an enum
wavpack: don't use "isp" before initialization
wavpack: moved code to wavpack_open_wvc()
simplified code in the ogg decoder plugin
...
Diffstat (limited to '')
| -rw-r--r-- | src/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c index e897cacc1..9d75fadc7 100644 --- a/src/main.c +++ b/src/main.c @@ -35,7 +35,6 @@ #include "inputStream.h" #include "state_file.h" #include "tag.h" -#include "tagTracker.h" #include "dbUtils.h" #include "../config.h" #include "utils.h" @@ -352,7 +351,7 @@ static void cleanUpPidFile(void) unlink(pidFileParam->value); } -static void killFromPidFile(char *cmd, int killOption) +static void killFromPidFile(void) { FILE *fp; ConfigParam *pidFileParam = parseConfigFilePath(CONF_PID_FILE, 0); @@ -391,7 +390,7 @@ int main(int argc, char *argv[]) parseOptions(argc, argv, &options); if (options.kill) - killFromPidFile(argv[0], options.kill); + killFromPidFile(); initStats(); initTagConfig(); |