summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-01-28 14:12:55 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-01-28 14:12:55 +0000
commit23eea7bc610364a0ee9213d44f7bede1092a1138 (patch)
tree326c12f0e228a2abbc04c6c762a73a8f17737593
parent6548949226baeaa2b4d4e2ce7a66cbf5ccb33516 (diff)
downloads6-23eea7bc610364a0ee9213d44f7bede1092a1138.tar.xz
code style fix, types change in doc
-rw-r--r--doc/libs6/ftrigr.html4
-rw-r--r--doc/libs6/s6lock.html6
-rw-r--r--src/supervision/s6-supervise.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/doc/libs6/ftrigr.html b/doc/libs6/ftrigr.html
index c3d6f75..b16081f 100644
--- a/doc/libs6/ftrigr.html
+++ b/doc/libs6/ftrigr.html
@@ -155,7 +155,7 @@ ftrigr_end(&amp;a) ;
<pre>
char const *path = "/var/lib/myservice/fifodir" ;
char const *re = "a.*b|c*d" ;
-uint32 options = 0 ;
+uint32_t options = 0 ;
uint16 id = ftrigr_subscribe (&amp;a, path, re, options, &amp;deadline, &amp;stamp) ;
</pre>
@@ -188,7 +188,7 @@ and events can be sent without the risk of a race condition.
<h3> Synchronously waiting for events </h3>
<pre>
-uint16 list[1] ;
+uint16_t list[1] ;
unsigned int n = 1 ;
char trigger ;
list[0] = id ;
diff --git a/doc/libs6/s6lock.html b/doc/libs6/s6lock.html
index 37c5351..cffe3f8 100644
--- a/doc/libs6/s6lock.html
+++ b/doc/libs6/s6lock.html
@@ -109,7 +109,7 @@ s6lock_end(&amp;a) ;
<h3> Acquiring and releasing locks </h3>
<pre>
-uint16 id ;
+uint16_t id ;
char const *file = "lockfile" ;
tain_t limit ;
tain_t deadline ;
@@ -219,7 +219,7 @@ number may have been transmitted from
<h3> Synchronously waiting for locks </h3>
<p>
-<code> int s6lock_wait_or_g (s6lock_t *a, uint16 const *idlist, unsigned int n, tain_t const *deadline) </code> <br />
+<code> int s6lock_wait_or_g (s6lock_t *a, uint16_t const *idlist, unsigned int n, tain_t const *deadline) </code> <br />
Synchronously waits for <em>one</em> of the locks represented by the array pointed to
by <em>idlist</em> of length <em>n</em> to be acquired. Returns -1 if it fails,
or a nonnegative number on success, which is the index in <em>idlist</em> of the
@@ -228,7 +228,7 @@ function returns -1 ETIMEDOUT.
</p>
<p>
-<code> int s6lock_wait_and_g (s6lock_t *a, uint16 const *idlist, unsigned int n, tain_t const *deadline) </code> <br />
+<code> int s6lock_wait_and_g (s6lock_t *a, uint16_t const *idlist, unsigned int n, tain_t const *deadline) </code> <br />
Synchronously waits for <em>all</em> of the locks represented by the array pointed to
by <em>idlist</em> of length <em>n</em> to be acquired. Returns -1 if it fails and
0 if it succeeds. If no result has been obtained by <em>deadline</em>, the
diff --git a/src/supervision/s6-supervise.c b/src/supervision/s6-supervise.c
index a79f351..00d04d1 100644
--- a/src/supervision/s6-supervise.c
+++ b/src/supervision/s6-supervise.c
@@ -451,7 +451,7 @@ static void finish_X (void)
static void lastfinish_z (void)
{
finish_z() ;
- bail ();
+ bail() ;
}
static action_t_ref const actions[5][25] =