ccan: Correct some poor conventions in _info includes

There are a couple of small problems with the includes used in most of
ccan's _info files.

   * _info routinely uses printf(), and so should include <stdio.h>, but
only some of them do.  We get away with it, because they do include
<string.h>, which apparently includes <stdio.h> indirectly, but we should
be explicit about it.

   * Most _info files were including config.h after the system headers.
That _seems_ sensible, but actually causes problems.  Because config.h
defines _GNU_SOURCE it can change the behaviour of the system headers.
More specifically it can make them behave differently to how the individual
module headers (which have included config.h) expects them to behave.

This patch adjusts all the existing _info files and, more importantly,
the template constructed by ccanlint.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/ccan/alignof/_info b/ccan/alignof/_info
index 7eca1f2d32c04c747bbb5e926b5a6fb4531e8975..e0952c652810b5a3cdadd0597d2e9aa74ec003ef 100644 (file)
--- a/ccan/alignof/_info
+++ b/ccan/alignof/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * alignof - ALIGNOF() macro to determine alignment of a type.

diff --git a/ccan/antithread/_info b/ccan/antithread/_info
index ba6de000efa8c02b24211576da01ef37ca2dad62..7bde2018a025514aafd90e84b371aa1db03fa075 100644 (file)
--- a/ccan/antithread/_info
+++ b/ccan/antithread/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * antithread - Accelerated Native Technology Implementation of "threads"

diff --git a/ccan/antithread/alloc/_info b/ccan/antithread/alloc/_info
index 5ad18002e9563c2e5091445402e15335aabd6422..bf4756ed01f9c961a20848b595a2639f731291e3 100644 (file)
--- a/ccan/antithread/alloc/_info
+++ b/ccan/antithread/alloc/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * antithread/alloc - memory allocator routines

diff --git a/ccan/argcheck/_info b/ccan/argcheck/_info
index 620ff838a2d59e82188803b970be1836649a89bb..f8b37c2f26b788a3bfc4a95085c5846d11ca3254 100644 (file)
--- a/ccan/argcheck/_info
+++ b/ccan/argcheck/_info
@@ -1,4 +1,6 @@
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * argcheck - macros to check arguments at runtime

diff --git a/ccan/array_size/_info b/ccan/array_size/_info
index d670042decab79a8ec2f3e8fce54c1825c5c5099..b8a9a85094b19a7e3e2e991a8c7c23b4cc2412ac 100644 (file)
--- a/ccan/array_size/_info
+++ b/ccan/array_size/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * array_size - routine for safely deriving the size of a visible array.

diff --git a/ccan/asearch/_info b/ccan/asearch/_info
index 35282c4f5e734dd1d4fe0de9d84e9151e6776d6e..fae6e4aae17ee013e65b8ac76d9a947ad63ce808 100644 (file)
--- a/ccan/asearch/_info
+++ b/ccan/asearch/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * asearch - typesafe binary search (bsearch)

diff --git a/ccan/asort/_info b/ccan/asort/_info
index 2d3e66e8621ec2d54a41c8cbe57edec49dc29bc6..57523cc9db929582be65ca2cf29dabc5318bc382 100644 (file)
--- a/ccan/asort/_info
+++ b/ccan/asort/_info
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 

diff --git a/ccan/asprintf/_info b/ccan/asprintf/_info
index 1aa5d34f57a4f3c419986c9601523cb11c64aaff..f72d668cc0633ab77e785b0f13fe01b2c0845b61 100644 (file)
--- a/ccan/asprintf/_info
+++ b/ccan/asprintf/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * asprintf - asprintf wrapper (and if necessary, implementation).

diff --git a/ccan/autodata/_info b/ccan/autodata/_info
index c9cf266391d8422a3a64443bee4da769bd6a0cd9..a101276d7720ae1988664f20acc3fd31a26769d0 100644 (file)
--- a/ccan/autodata/_info
+++ b/ccan/autodata/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * autodata - stash pointers in your binary for automatic registration

diff --git a/ccan/avl/_info b/ccan/avl/_info
index 94b3d2eb728c2cff0b5147b0e6ed54c13465bc28..83893ddb468fffa59f24980b488472f0d946caca 100644 (file)
--- a/ccan/avl/_info
+++ b/ccan/avl/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * avl - Key-value dictionary based on AVL trees

diff --git a/ccan/bdelta/_info b/ccan/bdelta/_info
index 8b1135ad560961e7abb1725213362d64f938b257..75d6556f3c1d4b4a7bee75841cac19b7dbdd7937 100644 (file)
--- a/ccan/bdelta/_info
+++ b/ccan/bdelta/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * bdelta - Generate and apply binary deltas

diff --git a/ccan/bitmap/_info b/ccan/bitmap/_info
index 2038058ff205846a4ce38ed2ca1f424ab60cac6c..b8d297d168d800535beb85c5409c512167bcf038 100644 (file)
--- a/ccan/bitmap/_info
+++ b/ccan/bitmap/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * bitmap - bitmap handling

diff --git a/ccan/block_pool/_info b/ccan/block_pool/_info
index d89da5bd1736bc59503d61a46a962210ba9e51ef..a42cdba4b5c6148ddf347ea3087cd2cc63cef3c8 100644 (file)
--- a/ccan/block_pool/_info
+++ b/ccan/block_pool/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * block_pool - An efficient allocator for blocks that don't need to be resized or freed.

diff --git a/ccan/breakpoint/_info b/ccan/breakpoint/_info
index 5f5251e6ddc05d3124bf429c62115c7b140911d9..272ee25d33666bac134f68fafb47330ecde246dc 100644 (file)
--- a/ccan/breakpoint/_info
+++ b/ccan/breakpoint/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * breakpoint - break if the program is run under gdb.

diff --git a/ccan/btree/_info b/ccan/btree/_info
index e5f231312f55c443555522d57cd165e528e7c745..7a69ed910243e5bead2fb60109a326383607abd2 100644 (file)
--- a/ccan/btree/_info
+++ b/ccan/btree/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * btree - Efficient sorted associative container based on B-trees.

diff --git a/ccan/build_assert/_info b/ccan/build_assert/_info
index bce92b7e182ea0d439ec3be07494ef82ec0295f8..97ebe6c966836753456f7d45fc45aef1dde94809 100644 (file)
--- a/ccan/build_assert/_info
+++ b/ccan/build_assert/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * build_assert - routines for build-time assertions

diff --git a/ccan/bytestring/_info b/ccan/bytestring/_info
index 5b0849162cab922fe5151c26573e277339556b18..32de954fc59561ac36aaa73499ce251642480fdb 100644 (file)
--- a/ccan/bytestring/_info
+++ b/ccan/bytestring/_info
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <string.h>
 #include "config.h"
 

diff --git a/ccan/cast/_info b/ccan/cast/_info
index d66e7091b42ccfc45a1d7c86c12b114f6b4b4d3a..f5cd37fc337bf42159f3f4fa66fc846031eb6d20 100644 (file)
--- a/ccan/cast/_info
+++ b/ccan/cast/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * cast - routines for safer casting.

diff --git a/ccan/ccan_tokenizer/_info b/ccan/ccan_tokenizer/_info
index ad01ceae846bc3cb2518a15ee55f733ea0ede16d..aef90fb91065e94097084718df66b782bc685b91 100644 (file)
--- a/ccan/ccan_tokenizer/_info
+++ b/ccan/ccan_tokenizer/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <string.h>
 #include <stdio.h>
-#include "config.h"
 
 /**
  * ccan_tokenizer - A full-text lexer for C source files

diff --git a/ccan/charset/_info b/ccan/charset/_info
index e07d7040488cccfaf7e41a345ecc019843c0525e..aa0193d7e4b83de5f1c37dba73969be65194b6a2 100644 (file)
--- a/ccan/charset/_info
+++ b/ccan/charset/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * charset - character set conversion and validation routines

diff --git a/ccan/check_type/_info b/ccan/check_type/_info
index cb19e20283caf56fc45aca0a76a9dee9e695c652..cc426734928192eb677e1a3129d8eb1dc696104b 100644 (file)
--- a/ccan/check_type/_info
+++ b/ccan/check_type/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * check_type - routines for compile time type checking

diff --git a/ccan/ciniparser/_info b/ccan/ciniparser/_info
index c252257e50f4db9cc742ae781ca1a427681bb9e1..749a4558cc8d71ae8e53869a26267a536abc4b88 100644 (file)
--- a/ccan/ciniparser/_info
+++ b/ccan/ciniparser/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * ciniparser - easily parse and manipulate ini style configuration files

diff --git a/ccan/compiler/_info b/ccan/compiler/_info
index fc9318f6d576115fee286f7ce630e0d83a563550..d60dff4d17bb0a50b691bb83097debdc94f38cf5 100644 (file)
--- a/ccan/compiler/_info
+++ b/ccan/compiler/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <string.h>
 #include <stdio.h>
-#include "config.h"
 
 /**
  * compiler - macros for common compiler extensions

diff --git a/ccan/container_of/_info b/ccan/container_of/_info
index 77b3bd15fa5ada5101378a7305cda1d5a1675b37..d50094bc68ec1ef077182028c0d045923160562f 100644 (file)
--- a/ccan/container_of/_info
+++ b/ccan/container_of/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * container_of - routine for upcasting

diff --git a/ccan/cpuid/_info b/ccan/cpuid/_info
index 79a98c0a236dfc2ad98010a01afb4bcb9726f74c..5699a2cc8173d6eaf82b2f0de18cd7a5f6c1eb66 100644 (file)
--- a/ccan/cpuid/_info
+++ b/ccan/cpuid/_info
@@ -1,3 +1,7 @@
+#include "config.h"
+#include <stdio.h>
+#include <string.h>
+
 #include "cpuid.h"
 
 /**

diff --git a/ccan/crc/_info b/ccan/crc/_info
index 3511b8e2dcc4a16f76ba41bd9614585776ac7551..c59d58ec8e19eb847a7d54d8926eefa0890e3a2c 100644 (file)
--- a/ccan/crc/_info
+++ b/ccan/crc/_info
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <string.h>
 #include <stdio.h>
 

diff --git a/ccan/crcsync/_info b/ccan/crcsync/_info
index e6d51784e87d917e16308f68e93b45846f5e7c7c..9ebb8bd8a01e7e844ccc62e90bc0454d11904781 100644 (file)
--- a/ccan/crcsync/_info
+++ b/ccan/crcsync/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * crcsync - routines to use crc for an rsync-like protocol.

diff --git a/ccan/daemon_with_notify/_info b/ccan/daemon_with_notify/_info
index be72b9185bcb73d3b74f28bb1b24cdd5e7f015d6..cb53a3e6efd0d656ccfdd3342d8df859d6ae5116 100644 (file)
--- a/ccan/daemon_with_notify/_info
+++ b/ccan/daemon_with_notify/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * daemon_with_notify - daemonize a process, can wait for child to signal readiness

diff --git a/ccan/daemonize/_info b/ccan/daemonize/_info
index f0e55bcbb6a0b1912d3f4d9125bfb15231e5d45b..0c4bc98063caa5632eff9d0038773cf96f3df5f2 100644 (file)
--- a/ccan/daemonize/_info
+++ b/ccan/daemonize/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * daemonize - routine to turn a process into a well-behaved daemon.

diff --git a/ccan/darray/_info b/ccan/darray/_info
index 8be9a7800c09a70429542aa3d86b0b3303403673..b6d5e4bad1dbaa9d8b6f0ecfeea5400099dfe93c 100644 (file)
--- a/ccan/darray/_info
+++ b/ccan/darray/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 #include "ccan/darray/darray.h"
 

diff --git a/ccan/dgraph/_info b/ccan/dgraph/_info
index 10c829638720877a5bb5e317ed6c07232a7d4261..81a75a77a45310b517ee8ecd3bc88f6f38063078 100644 (file)
--- a/ccan/dgraph/_info
+++ b/ccan/dgraph/_info
@@ -1,4 +1,5 @@
 #include "config.h"
+#include <stdio.h>
 #include <string.h>
 
 /**

diff --git a/ccan/endian/_info b/ccan/endian/_info
index a71b9ae7222e5abf3c921784e093bac2b7cfdaf4..efe5a8bbde753164ea206d0b4d82c9bc4a9f1763 100644 (file)
--- a/ccan/endian/_info
+++ b/ccan/endian/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * endian - endian conversion macros for simple types

diff --git a/ccan/err/_info b/ccan/err/_info
index 64cc2cef01d80579bb57d6c47c751902c5ef6a30..2af206633e935c9ca956a40cd5bc43e470c71a75 100644 (file)
--- a/ccan/err/_info
+++ b/ccan/err/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * err - err(), errx(), warn() and warnx(), as per BSD's err.h.

diff --git a/ccan/failtest/_info b/ccan/failtest/_info
index ca2b60ea37c40931a5262945470b4764ffa465ef..87569f919848ca4ea79a8842ae713d580a38bde1 100644 (file)
--- a/ccan/failtest/_info
+++ b/ccan/failtest/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * failtest - unit test helpers for testing malloc and other failures.

diff --git a/ccan/grab_file/_info b/ccan/grab_file/_info
index 1db4c2956f99d7b164673ad08598028b926f7c80..2508a2eeabaa185c8b4eb5b9ad7a2eb31cd699e6 100644 (file)
--- a/ccan/grab_file/_info
+++ b/ccan/grab_file/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * grab_file - file helper routines

diff --git a/ccan/hash/_info b/ccan/hash/_info
index d9754527a50c3a335c0ab45889db264a1e723b3e..bbb3685b5a4dee7790da89bfbf1b2d5141ad6ad4 100644 (file)
--- a/ccan/hash/_info
+++ b/ccan/hash/_info
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <string.h>
 #include <stdio.h>
 

diff --git a/ccan/heap/_info b/ccan/heap/_info
index 552b139e71634625d070e6874af9ee912fb5849d..fe5866d046773c277d76e62dc5bacb5e46d70a46 100644 (file)
--- a/ccan/heap/_info
+++ b/ccan/heap/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * heap - a simple heap implementation

diff --git a/ccan/htable/_info b/ccan/htable/_info
index 1553da2b0e85e7df8378da6e6e4cf2f9b8464dd8..7e06c3867a3f977797720e54368f25cb3084d6c6 100644 (file)
--- a/ccan/htable/_info
+++ b/ccan/htable/_info
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <string.h>
 #include <stdio.h>
 

diff --git a/ccan/idtree/_info b/ccan/idtree/_info
index 664e7cf7ea567fea17ccc5ba68a97015c56bcd84..cc0c09e68d7b843566f792b455a870e3b495225e 100644 (file)
--- a/ccan/idtree/_info
+++ b/ccan/idtree/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * idtree - id allocation tree

diff --git a/ccan/ilog/_info b/ccan/ilog/_info
index d57c05d4d25062032c390a31d5e75d1d92ced38f..f1f3f2d5b8a180030432ae88f2d4fd161f383361 100644 (file)
--- a/ccan/ilog/_info
+++ b/ccan/ilog/_info
@@ -35,9 +35,9 @@
  * License: CC0 (Public domain)
  * Author: Timothy B. Terriberry <tterribe@xiph.org>
  */
+#include "config.h"
 #include <string.h>
 #include <stdio.h>
-#include "config.h"
 
 int main(int _argc,const char *_argv[]){
   /*Expect exactly one argument.*/

diff --git a/ccan/io/_info b/ccan/io/_info
index 8f5c2adc3008fc58bfb4758331a9eb56e7812636..0ba46a638eabd2a348925c9b31278d7d5970b4db 100644 (file)
--- a/ccan/io/_info
+++ b/ccan/io/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * io - simple library for asynchronous io handling.

diff --git a/ccan/isaac/_info b/ccan/isaac/_info
index 81c6ff23784895487848479540f55a05073472fd..c0e25eea91ce2f0f366730a36dddad3bb35acd0d 100644 (file)
--- a/ccan/isaac/_info
+++ b/ccan/isaac/_info
@@ -104,9 +104,9 @@
  *     // We actually depend on the LGPL ilog routines, so not PD :(
  *     license_depends_compat FAIL
  */
+#include "config.h"
 #include <string.h>
 #include <stdio.h>
-#include "config.h"
 
 int main(int _argc,const char *_argv[]){
   /*Expect exactly one argument.*/

diff --git a/ccan/iscsi/_info b/ccan/iscsi/_info
index f75f2c25f28ce699e887e19a68ac46995f2e7fea..525770369c4e49965cd3927b1ce78aa6aa586dae 100644 (file)
--- a/ccan/iscsi/_info
+++ b/ccan/iscsi/_info
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 

diff --git a/ccan/jacobson_karels/_info b/ccan/jacobson_karels/_info
index 9165470338042aa632bc81298b9123924f245ed3..a066f469e523f6eb1b265ce9ad97db9a8c5c6ba8 100644 (file)
--- a/ccan/jacobson_karels/_info
+++ b/ccan/jacobson_karels/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * jacobson_karels - Jacobson/Karels Round Trip Time algorithm

diff --git a/ccan/jmap/_info b/ccan/jmap/_info
index 966a51a40200f5db67003659f76c1c0668ea5c19..739e60af7a105bf7f08c84e0242f19b448880289 100644 (file)
--- a/ccan/jmap/_info
+++ b/ccan/jmap/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * jmap - map from indices to values (based on libJudy)

diff --git a/ccan/jset/_info b/ccan/jset/_info
index 6ff928f1f6079cc34b3c691911ba51a4a048153c..b6759ec553401a225c5e80cf794bdd49e73517cd 100644 (file)
--- a/ccan/jset/_info
+++ b/ccan/jset/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * jset - set of pointers (based on libJudy)

diff --git a/ccan/json/_info b/ccan/json/_info
index 0544cf5bb84c4b2d0e9a1efd919e22dc65f74484..3113b63ee7e5f42b4ccaeeafe805ca58e793fc5e 100644 (file)
--- a/ccan/json/_info
+++ b/ccan/json/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * json - Parse and generate JSON (JavaScript Object Notation)

diff --git a/ccan/lbalance/_info b/ccan/lbalance/_info
index 2121ed2b4da2f53756118fc75f1f7ec5076cec68..7524e54ca73b22ebae4d10790844877287b0871a 100644 (file)
--- a/ccan/lbalance/_info
+++ b/ccan/lbalance/_info
@@ -1,5 +1,6 @@
 /* Licensed under GPLv3+ - see LICENSE file for details */
 #include "config.h"
+#include <stdio.h>
 #include <string.h>
 
 /**

diff --git a/ccan/likely/_info b/ccan/likely/_info
index b6885ef1fff346a0e0592b5265f57cad291d164d..095ed2f7b472e7d4aeaab22099182d911e631c9c 100644 (file)
--- a/ccan/likely/_info
+++ b/ccan/likely/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <string.h>
 #include <stdio.h>
-#include "config.h"
 
 /**
  * likely - macros for annotating likely/unlikely branches in the code

diff --git a/ccan/list/_info b/ccan/list/_info
index 75e3837c488d9ad03a2d1c0c3aeafb7598c73c4d..60790a9903f084eb0492436a95dd097eefe67416 100644 (file)
--- a/ccan/list/_info
+++ b/ccan/list/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * list - double linked list routines

diff --git a/ccan/md4/_info b/ccan/md4/_info
index 6c6f9d810f17bd683032cfa14a4f91a0aef4a82b..4ccdddf9a6441e34d9afdf5d2a5d73961d0123db 100644 (file)
--- a/ccan/md4/_info
+++ b/ccan/md4/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * md4 - MD4 Message Digest Algorithm (RFC1320).

diff --git a/ccan/minmax/_info b/ccan/minmax/_info
index 1490ba437ca9a97898853616a436d9eda33fb6aa..4d95336a92f73254e1660e329d76360d7a21a968 100644 (file)
--- a/ccan/minmax/_info
+++ b/ccan/minmax/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * minmax - typesafe minimum and maximum functions

diff --git a/ccan/net/_info b/ccan/net/_info
index b4b219fd3599094a7195e9c1a83c24bc79a8c28f..5ac83f95cec1763d27490512c4cfa98d1bf594a9 100644 (file)
--- a/ccan/net/_info
+++ b/ccan/net/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * net - simple IPv4/IPv6 socket library

diff --git a/ccan/nfs/_info b/ccan/nfs/_info
index 412c8dd5f9973b216e4d35166704eca727049961..0efc04792eeba50692499355d7960046570e068f 100644 (file)
--- a/ccan/nfs/_info
+++ b/ccan/nfs/_info
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <string.h>
 #include <stdio.h>
 

diff --git a/ccan/noerr/_info b/ccan/noerr/_info
index ebc407d8cd6b454002eac15be808549b5677a1b5..082c71e601e451cf77ef022555d25d102f054de2 100644 (file)
--- a/ccan/noerr/_info
+++ b/ccan/noerr/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * noerr - routines for cleaning up without blatting errno

diff --git a/ccan/objset/_info b/ccan/objset/_info
index cf290289b88387d18ffc8a8ced8ac474f96e4a57..5831f584da9e3707710c6141f34cbaeac6da3e98 100644 (file)
--- a/ccan/objset/_info
+++ b/ccan/objset/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * objset - unordered set of pointers.

diff --git a/ccan/ogg_to_pcm/_info b/ccan/ogg_to_pcm/_info
index c987b22b39349d2105f89e6fa907ed240ed8b509..d48a5f9dc16e6391f65c7718933061f0fad4b01b 100644 (file)
--- a/ccan/ogg_to_pcm/_info
+++ b/ccan/ogg_to_pcm/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * ogg_to_pcm - decode ogg vorbis audio files to PCM data using libvorbis 

diff --git a/ccan/opt/_info b/ccan/opt/_info
index 9d47c48f62abaf2933130d031fbd07bbdc7d7304..103962069b6b4c813fe45fbe2a02006e72128a77 100644 (file)
--- a/ccan/opt/_info
+++ b/ccan/opt/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * opt - simple command line parsing

diff --git a/ccan/ptr_valid/_info b/ccan/ptr_valid/_info
index b577535f3bccc84d2d03fbb03bcc1b186452a08e..91c9abd37579905d2c1ecfa9fa3eda26fcb10a01 100644 (file)
--- a/ccan/ptr_valid/_info
+++ b/ccan/ptr_valid/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * ptr_valid - test whether a pointer is safe to dereference.

diff --git a/ccan/rbtree/_info b/ccan/rbtree/_info
index 58afa05d985366d3ff1fbb27c21057e9b3012eec..7d314a0a4f335769e1a77e81929c1dbe8bc48380 100644 (file)
--- a/ccan/rbtree/_info
+++ b/ccan/rbtree/_info
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 

diff --git a/ccan/rbuf/_info b/ccan/rbuf/_info
index 30232db2cced60ede94bca9dbf6a4e6a3e153f5a..7c9224d0374f3e2b88999e7b2b2bb0e2a628dba5 100644 (file)
--- a/ccan/rbuf/_info
+++ b/ccan/rbuf/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * rbuf - buffered I/O input primitive.

diff --git a/ccan/read_write_all/_info b/ccan/read_write_all/_info
index d70cbd1d1571e431a46819f91a9d854e9ca01643..20c5e8454fd3b00be4a84acb5714dc178ba927a3 100644 (file)
--- a/ccan/read_write_all/_info
+++ b/ccan/read_write_all/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * read_write_all - read_all and write_all routines.

diff --git a/ccan/short_types/_info b/ccan/short_types/_info
index f324e359ac8a01f35353e753445b114fbd795d31..909e4e3aed0ea3f45a9e4ff3451cab1573791a61 100644 (file)
--- a/ccan/short_types/_info
+++ b/ccan/short_types/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * short_types - shorter names for standard integer types

diff --git a/ccan/siphash/_info b/ccan/siphash/_info
index e6d518aa40bf533edbfadfa9819ee28a3a494672..d42ddab4c698800f5c390d43ff660f31ca866cfd 100644 (file)
--- a/ccan/siphash/_info
+++ b/ccan/siphash/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * siphash - a keyed hash function

diff --git a/ccan/sparse_bsearch/_info b/ccan/sparse_bsearch/_info
index a2b77c100370008c7ddc7fc6b5a9752fd1592cfb..eb1e735a1e93efefa140d5273b9d87c0f5f278ab 100644 (file)
--- a/ccan/sparse_bsearch/_info
+++ b/ccan/sparse_bsearch/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <string.h>
 #include <stdio.h>
-#include "config.h"
 
 /**
  * sparse_bsearch - search a sorted array with some invalid entries

diff --git a/ccan/str/_info b/ccan/str/_info
index 548f059d76f56210491b8b9bbc8c8ac57c36c1bd..251d999a83f47328ead2ca8720d9859f59f43d03 100644 (file)
--- a/ccan/str/_info
+++ b/ccan/str/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * str - string helper routines

diff --git a/ccan/stringmap/_info b/ccan/stringmap/_info
index 49eff19cf359da262c25a5fda440410b28d24fa1..1f6465b6c8c46cf93421369c15e63cc2f42c386c 100644 (file)
--- a/ccan/stringmap/_info
+++ b/ccan/stringmap/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * stringmap - Macros for mapping strings to things

diff --git a/ccan/strmap/_info b/ccan/strmap/_info
index 6d03b0caaa9c4c81ec30bba34e66e3dddf4d7dbb..33176b304e8522b9fb5534f773db322b904addf7 100644 (file)
--- a/ccan/strmap/_info
+++ b/ccan/strmap/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * strmap - an ordered map of strings to values

diff --git a/ccan/strset/_info b/ccan/strset/_info
index 4984959cee038665c9eaa0b9de8b9ea448109951..3f4f7733f23e6b926891835ff859e37133d5e5cf 100644 (file)
--- a/ccan/strset/_info
+++ b/ccan/strset/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * strset - an ordered set of strings

diff --git a/ccan/take/_info b/ccan/take/_info
index 34b0886102c8e835cb0649a1fc378559f20db3de..a3ac53921aeeec693996c486f65620d72cf95018 100644 (file)
--- a/ccan/take/_info
+++ b/ccan/take/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * take - routines to mark pointers to be consumed by called functions.

diff --git a/ccan/tal/_info b/ccan/tal/_info
index 0d75f56e0ed6a7f975d39640402672a6868c69b9..890cb2e767a638b346f90e8f5b6be76bd6db3b2c 100644 (file)
--- a/ccan/tal/_info
+++ b/ccan/tal/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * tal - compact tree allocator routines (inspired by talloc)

diff --git a/ccan/tal/grab_file/_info b/ccan/tal/grab_file/_info
index 3b323d3325d232ac9136b311ca56123f7c42fa29..68ad089b06f23d59e4ef318f0f107c76a9e50e87 100644 (file)
--- a/ccan/tal/grab_file/_info
+++ b/ccan/tal/grab_file/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * tal/grab_file - file helper routines

diff --git a/ccan/tal/link/_info b/ccan/tal/link/_info
index d128e0106c2bc3eb779c052b4cfb3144ead55688..6962cb45fc033bfbca291a95782b90bab4e87626 100644 (file)
--- a/ccan/tal/link/_info
+++ b/ccan/tal/link/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * tal/link - link helper for tal

diff --git a/ccan/tal/path/_info b/ccan/tal/path/_info
index 24b9e468fe96a83c9f30025b5e74cc3b1a5ea7e5..22fcbcc8b69e49412e95adee0a253ea4f62e7969 100644 (file)
--- a/ccan/tal/path/_info
+++ b/ccan/tal/path/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * tal/path - routines to manipulate paths

diff --git a/ccan/tal/str/_info b/ccan/tal/str/_info
index 381dd98b1d1aa6d01a8f02ef2e54382081c4fb5f..6fd94dc5654093d3dc909f7175791784f70b9fd4 100644 (file)
--- a/ccan/tal/str/_info
+++ b/ccan/tal/str/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * tal/str - string helper routines which use tal

diff --git a/ccan/tal/talloc/_info b/ccan/tal/talloc/_info
index 9b1544d0885721d5ea496005f6369d40534b5280..00241aa62fa0c0cf5db038f11817a23ca828cf7d 100644 (file)
--- a/ccan/tal/talloc/_info
+++ b/ccan/tal/talloc/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * tal/talloc - an implementation of the tal interface in terms of talloc.

diff --git a/ccan/talloc/_info b/ccan/talloc/_info
index 0ae45e73d814d1aebadd4d884463a26125a3c7c9..182299eaed2554910090892b9e3a63bfb5d1b867 100644 (file)
--- a/ccan/talloc/_info
+++ b/ccan/talloc/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * talloc - tree allocator routines

diff --git a/ccan/tally/_info b/ccan/tally/_info
index 6dab9b7dd6faabccd8cad6f222243b2f0e371436..c75897c64452c1b191f7a160c9492929026fb16a 100644 (file)
--- a/ccan/tally/_info
+++ b/ccan/tally/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * tally - running tally of integers

diff --git a/ccan/tap/_info b/ccan/tap/_info
index baea996a766e6d38e9128e413ec725943814bd3b..2b116de953b279bd9cfc3c13658bd41df0b4de01 100644 (file)
--- a/ccan/tap/_info
+++ b/ccan/tap/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * tap - Test Anything Protocol

diff --git a/ccan/tcon/_info b/ccan/tcon/_info
index 895da9e1c1c32009c1f892c0e4a95fef2ad98d6d..c07e41ed00f0bff432ab35e7e07c05efdc227982 100644 (file)
--- a/ccan/tcon/_info
+++ b/ccan/tcon/_info
@@ -1,4 +1,5 @@
 #include "config.h"
+#include <stdio.h>
 #include <string.h>
 
 /**

diff --git a/ccan/time/_info b/ccan/time/_info
index 5cf20f79611a85e3322b4b08b0ae57dadd547efb..ae410a7a8020b2f18547f758e02b382d172b2559 100644 (file)
--- a/ccan/time/_info
+++ b/ccan/time/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * time - routines for dealing with time

diff --git a/ccan/timer/_info b/ccan/timer/_info
index 580b115c563d289d6a1195af61cd5e53ca471124..4c58d9e5f5bee7da8dce493b53946f84931b8975 100644 (file)
--- a/ccan/timer/_info
+++ b/ccan/timer/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * timer - efficient implementation of rarely-expiring timers.

diff --git a/ccan/tlist/_info b/ccan/tlist/_info
index e18e2efb23b654924d0ec726765eb35340118cfa..e6b16ef0ae2c97f4ac3a8289c05112f5d8ae900f 100644 (file)
--- a/ccan/tlist/_info
+++ b/ccan/tlist/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * tlist - typesafe double linked list routines

diff --git a/ccan/ttxml/_info b/ccan/ttxml/_info
index 3ec45207bff73e09531ab160284e18bc9d7dcbe6..266a73404a152b0c008d87d6f9a107f8b3fb735f 100644 (file)
--- a/ccan/ttxml/_info
+++ b/ccan/ttxml/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * ttxml - tiny XML library for parsing (trusted!) XML documents.

diff --git a/ccan/typesafe_cb/_info b/ccan/typesafe_cb/_info
index 4485aec59010b3567593d3d29062645e6ca7bdd5..165852a3be2a1a4dd7c884dfbe48084991292ae1 100644 (file)
--- a/ccan/typesafe_cb/_info
+++ b/ccan/typesafe_cb/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * typesafe_cb - macros for safe callbacks.

diff --git a/ccan/version/_info b/ccan/version/_info
index 3aad1e8a56327cfa4080a28326a3640e35542301..ccdcbdbda10bf8b7f97528eacbf837161997239e 100644 (file)
--- a/ccan/version/_info
+++ b/ccan/version/_info
@@ -1,5 +1,6 @@
-#include <string.h>
 #include "config.h"
+#include <stdio.h>
+#include <string.h>
 
 /**
  * version - helper functions for major.minor-style version numbers

diff --git a/ccan/wwviaudio/_info b/ccan/wwviaudio/_info
index ba92f8f993fc1aea9206ef534048c6122cc22410..5fb6beb9ec099f7eeda5aa47c838684a10aea882 100644 (file)
--- a/ccan/wwviaudio/_info
+++ b/ccan/wwviaudio/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * wwviaudio - realtime playback and mixing of 16 bit signed PCM audio data.

diff --git a/tools/ccanlint/tests/info_exists.c b/tools/ccanlint/tests/info_exists.c
index 86101aa9eae8cc8cca98ba4d31484b3ac9244d8a..9f6f2066ddf90dc5d0149f68ee62827ae7d2f3cd 100644 (file)
--- a/tools/ccanlint/tests/info_exists.c
+++ b/tools/ccanlint/tests/info_exists.c
@@ -31,8 +31,9 @@ static void check_has_info(struct manifest *m,
 }
 
 static const char template[] =
-       "#include <string.h>\n"
        "#include \"config.h\"\n"
+       "#include <stdio.h>\n"
+       "#include <string.h>\n"
        "\n"
        "/**\n"
        " * %s - YOUR-ONE-LINE-DESCRIPTION-HERE\n"