1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
$NetBSD: patch-ab,v 1.5 2008/06/06 07:45:56 dsainty Exp $
Purge the unnecessary complication of PID_FORMAT, and add NetBSD support. Use
OSS for sound for NetBSD, because the Sun support is a bit too Sun-centric.
--- xbsndsrv.c.orig 2008-05-29 03:32:37.000000000 +1200
+++ xbsndsrv.c 2008-05-29 03:37:13.000000000 +1200
@@ -48,8 +48,6 @@
#ifdef __sun__
-/* format for pids on sun */
-#define PID_FORMAT "%lu"
/* needed for bzero(), open()*/
#include <strings.h>
#include <fcntl.h>
@@ -63,8 +61,6 @@
#else
-/* format for pids, non-sun */
-#define PID_FORMAT "%u"
/* non-sun audio includes */
#ifdef HAVE_SYS_SOUNDCARD_H
#include <sys/soundcard.h>
@@ -550,17 +546,17 @@
ptr = fopen (userPath, "r+");
if (ptr == NULL) {
ptr = fopen (userPath, "w+");
- sprintf (tmp, PID_FORMAT, getpid ());
+ sprintf (tmp, "%u", (unsigned int)getpid ());
fwrite (tmp, 1, strlen (tmp), ptr);
fclose (ptr);
return 0;
}
- fscanf (ptr, PID_FORMAT, &pid);
- fprintf (stderr, " " PID_FORMAT " \n", pid);
+ fscanf (ptr, "%u", &pid);
+ fprintf (stderr, " %u \n", pid);
if (kill (pid, 0) == -1 || pid <= 0) {
fseek (ptr, 0, SEEK_SET);
- sprintf (tmp, PID_FORMAT, getpid ());
+ sprintf (tmp, "%u", (unsigned int)getpid ());
fwrite (tmp, 1, strlen (tmp), ptr);
fclose (ptr);
return 0;
|
