X Strike Force XFree86 SVN commit: rev 907 - branches/4.3.0/sid/debian/patches
Author: branden
Date: 2004-01-13 11:20:49 -0500 (Tue, 13 Jan 2004)
New Revision: 907
Modified:
branches/4.3.0/sid/debian/patches/003b_xfs_fixes.diff
Log:
Add hunk to patch which declares StorePid() consistently with its
definition.
Expand on patch annotation.
Modified: branches/4.3.0/sid/debian/patches/003b_xfs_fixes.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/003b_xfs_fixes.diff 2004-01-13 16:10:58 UTC (rev 906)
+++ branches/4.3.0/sid/debian/patches/003b_xfs_fixes.diff 2004-01-13 16:20:49 UTC (rev 907)
@@ -8,6 +8,7 @@
files, and is more careful with the type of Pid_t.
- Allow the user to specify the pid filename on the command line with a
"-pid" option (courtesy of Nikita V. Youshchenko).
+ - Sort options in usage message alphabetically.
- Whitespace police.
xfs.man:
@@ -15,8 +16,8 @@
Not submitted upstream yet.
---- xc/programs/xfs/os/utils.c~ 2004-01-12 13:49:11.000000000 -0500
-+++ xc/programs/xfs/os/utils.c 2004-01-12 13:52:23.000000000 -0500
+--- xc/programs/xfs/os/utils.c.orig 2004-01-13 11:17:37.000000000 -0500
++++ xc/programs/xfs/os/utils.c 2004-01-13 11:18:06.000000000 -0500
@@ -3,7 +3,7 @@
* misc os utilities
*/
@@ -35,6 +36,15 @@
*
* Permission to use, copy, modify, distribute, and sell this software and
* its documentation for any purpose is hereby granted without fee, provided
+@@ -116,7 +116,7 @@
+ static char *pidFile = XFSPIDDIR "/xfs.pid";
+ static int pidFd;
+ static FILE *pidFilePtr;
+-static int StorePid (void);
++static long StorePid (void);
+
+ /* ARGSUSED */
+ SIGVAL
@@ -219,7 +219,7 @@
static void
usage(void)
Reply to: