Re: /usr/games/adventure include clean up

2016-03-06 Thread Edgar Pettijohn

--- io.c.origSun Mar  6 12:43:12 2016
+++ io.cSun Mar  6 12:43:36 2016
@@ -37,7 +37,9 @@

 /*Re-coding of advent in C: file i/o and user i/o*/

+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
--- subr.c.origSun Mar  6 12:39:53 2016
+++ subr.cSun Mar  6 12:42:36 2016
@@ -37,8 +37,11 @@

 /*Re-coding of advent in C: subroutines from main*/

+#include 
+#include 
 #include 
 #include 
+#include 
 #include "hdr.h"
 #include "extern.h"

--- wizard.c.origSun Mar  6 12:40:09 2016
+++ wizard.cSun Mar  6 12:40:59 2016
@@ -37,11 +37,12 @@

 /*Re-coding of advent in C: privileged operations*/

+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
-
 #include "extern.h"
 #include "hdr.h"



On 03/06/16 12:35, Michael McConville wrote:

The sys includes should be first and separate. See style(9).

Edgar Pettijohn wrote:

--- crc.c.origSun Mar  6 10:31:34 2016
+++ crc.cSun Mar  6 10:31:55 2016
@@ -33,6 +33,7 @@
   * SUCH DAMAGE.
   */

+#include 
  #include "extern.h"

  unsigned long crctab[] = {
--- done.c.origSun Mar  6 10:40:59 2016
+++ done.cSun Mar  6 10:42:25 2016
@@ -37,8 +37,10 @@

  /*Re-coding of advent in C: termination routines*/

+#include 
  #include 
  #include 
+#include 
  #include "hdr.h"
  #include "extern.h"

--- extern.h.origSun Mar  6 10:24:01 2016
+++ extern.hSun Mar  6 10:24:10 2016
@@ -30,9 +30,6 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */

-#include 
-#include 
-
  /* crc.c */
  void crc_start(void);
  unsigned long crc(const char *, int);
--- hdr.h.origSun Mar  6 10:40:26 2016
+++ hdr.hSun Mar  6 10:40:43 2016
@@ -52,9 +52,6 @@

  /* hdr.h: included by c advent files */

-#include 
-#include 
-
  int datfd;/* message file descriptor*/
  volatile sig_atomic_t delhit;
  int yea;
--- io.c.origSun Mar  6 10:47:06 2016
+++ io.cSun Mar  6 10:47:42 2016
@@ -38,9 +38,11 @@
  /*Re-coding of advent in C: file i/o and user i/o*/

  #include 
+#include 
  #include 
  #include 
  #include 
+#include 
  #include "hdr.h"
  #include "extern.h"

--- main.c.origSun Mar  6 10:25:22 2016
+++ main.cSun Mar  6 10:25:38 2016
@@ -41,6 +41,7 @@
  #include 
  #include 
  #include 
+#include 
  #include 
  #include "hdr.h"
  #include "extern.h"
--- save.c.origSun Mar  6 10:42:59 2016
+++ save.cSun Mar  6 10:43:46 2016
@@ -35,6 +35,7 @@
   * SUCH DAMAGE.
   */

+#include 
  #include 
  #include 
  #include "hdr.h"
--- subr.c.origSun Mar  6 10:26:03 2016
+++ subr.cSun Mar  6 10:45:14 2016
@@ -37,8 +37,11 @@

  /*Re-coding of advent in C: subroutines from main*/

+#include 
  #include 
  #include 
+#include 
+#include 
  #include "hdr.h"
  #include "extern.h"

--- vocab.c.origSun Mar  6 10:26:40 2016
+++ vocab.cSun Mar  6 10:46:00 2016
@@ -38,8 +38,11 @@
  /*Re-coding of advent in C: data structure routines*/

  #include 
+#include 
  #include 
  #include 
+#include 
+#include 
  #include "hdr.h"
  #include "extern.h"

--- wizard.c.origSun Mar  6 10:46:17 2016
+++ wizard.cSun Mar  6 10:46:55 2016
@@ -38,9 +38,11 @@
  /*Re-coding of advent in C: privileged operations*/

  #include 
+#include 
  #include 
  #include 
  #include 
+#include 
  #include "extern.h"
  #include "hdr.h"





Re: /usr/games/adventure include clean up

2016-03-06 Thread Michael McConville
There has to be a blank line after the sys includes.

Edgar Pettijohn wrote:
> --- io.c.origSun Mar  6 12:43:12 2016
> +++ io.cSun Mar  6 12:43:36 2016
> @@ -37,7 +37,9 @@
> 
>  /*Re-coding of advent in C: file i/o and user i/o*/
> 
> +#include 
>  #include 
> +#include 
>  #include 
>  #include 
>  #include 
> --- subr.c.origSun Mar  6 12:39:53 2016
> +++ subr.cSun Mar  6 12:42:36 2016
> @@ -37,8 +37,11 @@
> 
>  /*Re-coding of advent in C: subroutines from main*/
> 
> +#include 
> +#include 
>  #include 
>  #include 
> +#include 
>  #include "hdr.h"
>  #include "extern.h"
> 
> --- wizard.c.origSun Mar  6 12:40:09 2016
> +++ wizard.cSun Mar  6 12:40:59 2016
> @@ -37,11 +37,12 @@
> 
>  /*Re-coding of advent in C: privileged operations*/
> 
> +#include 
>  #include 
> +#include 
>  #include 
>  #include 
>  #include 
> -
>  #include "extern.h"
>  #include "hdr.h"
> 
> 
> 
> On 03/06/16 12:35, Michael McConville wrote:
> >The sys includes should be first and separate. See style(9).
> >
> >Edgar Pettijohn wrote:
> >>--- crc.c.origSun Mar  6 10:31:34 2016
> >>+++ crc.cSun Mar  6 10:31:55 2016
> >>@@ -33,6 +33,7 @@
> >>   * SUCH DAMAGE.
> >>   */
> >>
> >>+#include 
> >>  #include "extern.h"
> >>
> >>  unsigned long crctab[] = {
> >>--- done.c.origSun Mar  6 10:40:59 2016
> >>+++ done.cSun Mar  6 10:42:25 2016
> >>@@ -37,8 +37,10 @@
> >>
> >>  /*Re-coding of advent in C: termination routines*/
> >>
> >>+#include 
> >>  #include 
> >>  #include 
> >>+#include 
> >>  #include "hdr.h"
> >>  #include "extern.h"
> >>
> >>--- extern.h.origSun Mar  6 10:24:01 2016
> >>+++ extern.hSun Mar  6 10:24:10 2016
> >>@@ -30,9 +30,6 @@
> >>   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> >>   */
> >>
> >>-#include 
> >>-#include 
> >>-
> >>  /* crc.c */
> >>  void crc_start(void);
> >>  unsigned long crc(const char *, int);
> >>--- hdr.h.origSun Mar  6 10:40:26 2016
> >>+++ hdr.hSun Mar  6 10:40:43 2016
> >>@@ -52,9 +52,6 @@
> >>
> >>  /* hdr.h: included by c advent files */
> >>
> >>-#include 
> >>-#include 
> >>-
> >>  int datfd;/* message file descriptor*/
> >>  volatile sig_atomic_t delhit;
> >>  int yea;
> >>--- io.c.origSun Mar  6 10:47:06 2016
> >>+++ io.cSun Mar  6 10:47:42 2016
> >>@@ -38,9 +38,11 @@
> >>  /*Re-coding of advent in C: file i/o and user i/o*/
> >>
> >>  #include 
> >>+#include 
> >>  #include 
> >>  #include 
> >>  #include 
> >>+#include 
> >>  #include "hdr.h"
> >>  #include "extern.h"
> >>
> >>--- main.c.origSun Mar  6 10:25:22 2016
> >>+++ main.cSun Mar  6 10:25:38 2016
> >>@@ -41,6 +41,7 @@
> >>  #include 
> >>  #include 
> >>  #include 
> >>+#include 
> >>  #include 
> >>  #include "hdr.h"
> >>  #include "extern.h"
> >>--- save.c.origSun Mar  6 10:42:59 2016
> >>+++ save.cSun Mar  6 10:43:46 2016
> >>@@ -35,6 +35,7 @@
> >>   * SUCH DAMAGE.
> >>   */
> >>
> >>+#include 
> >>  #include 
> >>  #include 
> >>  #include "hdr.h"
> >>--- subr.c.origSun Mar  6 10:26:03 2016
> >>+++ subr.cSun Mar  6 10:45:14 2016
> >>@@ -37,8 +37,11 @@
> >>
> >>  /*Re-coding of advent in C: subroutines from main*/
> >>
> >>+#include 
> >>  #include 
> >>  #include 
> >>+#include 
> >>+#include 
> >>  #include "hdr.h"
> >>  #include "extern.h"
> >>
> >>--- vocab.c.origSun Mar  6 10:26:40 2016
> >>+++ vocab.cSun Mar  6 10:46:00 2016
> >>@@ -38,8 +38,11 @@
> >>  /*Re-coding of advent in C: data structure routines*/
> >>
> >>  #include 
> >>+#include 
> >>  #include 
> >>  #include 
> >>+#include 
> >>+#include 
> >>  #include "hdr.h"
> >>  #include "extern.h"
> >>
> >>--- wizard.c.origSun Mar  6 10:46:17 2016
> >>+++ wizard.cSun Mar  6 10:46:55 2016
> >>@@ -38,9 +38,11 @@
> >>  /*Re-coding of advent in C: privileged operations*/
> >>
> >>  #include 
> >>+#include 
> >>  #include 
> >>  #include 
> >>  #include 
> >>+#include 
> >>  #include "extern.h"
> >>  #include "hdr.h"
> >>
> 



Re: /usr/games/adventure include clean up

2016-03-06 Thread Michael McConville
The sys includes should be first and separate. See style(9).

Edgar Pettijohn wrote:
> --- crc.c.origSun Mar  6 10:31:34 2016
> +++ crc.cSun Mar  6 10:31:55 2016
> @@ -33,6 +33,7 @@
>   * SUCH DAMAGE.
>   */
> 
> +#include 
>  #include "extern.h"
> 
>  unsigned long crctab[] = {
> --- done.c.origSun Mar  6 10:40:59 2016
> +++ done.cSun Mar  6 10:42:25 2016
> @@ -37,8 +37,10 @@
> 
>  /*Re-coding of advent in C: termination routines*/
> 
> +#include 
>  #include 
>  #include 
> +#include 
>  #include "hdr.h"
>  #include "extern.h"
> 
> --- extern.h.origSun Mar  6 10:24:01 2016
> +++ extern.hSun Mar  6 10:24:10 2016
> @@ -30,9 +30,6 @@
>   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>   */
> 
> -#include 
> -#include 
> -
>  /* crc.c */
>  void crc_start(void);
>  unsigned long crc(const char *, int);
> --- hdr.h.origSun Mar  6 10:40:26 2016
> +++ hdr.hSun Mar  6 10:40:43 2016
> @@ -52,9 +52,6 @@
> 
>  /* hdr.h: included by c advent files */
> 
> -#include 
> -#include 
> -
>  int datfd;/* message file descriptor*/
>  volatile sig_atomic_t delhit;
>  int yea;
> --- io.c.origSun Mar  6 10:47:06 2016
> +++ io.cSun Mar  6 10:47:42 2016
> @@ -38,9 +38,11 @@
>  /*Re-coding of advent in C: file i/o and user i/o*/
> 
>  #include 
> +#include 
>  #include 
>  #include 
>  #include 
> +#include 
>  #include "hdr.h"
>  #include "extern.h"
> 
> --- main.c.origSun Mar  6 10:25:22 2016
> +++ main.cSun Mar  6 10:25:38 2016
> @@ -41,6 +41,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  #include 
>  #include "hdr.h"
>  #include "extern.h"
> --- save.c.origSun Mar  6 10:42:59 2016
> +++ save.cSun Mar  6 10:43:46 2016
> @@ -35,6 +35,7 @@
>   * SUCH DAMAGE.
>   */
> 
> +#include 
>  #include 
>  #include 
>  #include "hdr.h"
> --- subr.c.origSun Mar  6 10:26:03 2016
> +++ subr.cSun Mar  6 10:45:14 2016
> @@ -37,8 +37,11 @@
> 
>  /*Re-coding of advent in C: subroutines from main*/
> 
> +#include 
>  #include 
>  #include 
> +#include 
> +#include 
>  #include "hdr.h"
>  #include "extern.h"
> 
> --- vocab.c.origSun Mar  6 10:26:40 2016
> +++ vocab.cSun Mar  6 10:46:00 2016
> @@ -38,8 +38,11 @@
>  /*Re-coding of advent in C: data structure routines*/
> 
>  #include 
> +#include 
>  #include 
>  #include 
> +#include 
> +#include 
>  #include "hdr.h"
>  #include "extern.h"
> 
> --- wizard.c.origSun Mar  6 10:46:17 2016
> +++ wizard.cSun Mar  6 10:46:55 2016
> @@ -38,9 +38,11 @@
>  /*Re-coding of advent in C: privileged operations*/
> 
>  #include 
> +#include 
>  #include 
>  #include 
>  #include 
> +#include 
>  #include "extern.h"
>  #include "hdr.h"
>