logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0001-require-standard-C-function-prototype-support.patch (3773B)

    

  1. From 32ae5e241237d325b8108660f82419ce684a62a8 Mon Sep 17 00:00:00 2001
  2. From: Mike Frysinger <vapier@gmail.com>
  3. Date: Mon, 8 Feb 2021 00:28:08 -0500
  4. Subject: [PATCH] require standard C function prototype support
  6. We can drop the main prototype entirely as we don't need it.
  7. ---
  8.  Changes    |  3 +++
  9.  compress.c | 58 +++++++++++++++++++-----------------------------------
  10.  2 files changed, 23 insertions(+), 38 deletions(-)
  12. diff --git a/Changes b/Changes
  13. index 5bef4ec..40cd58d 100644
  14. --- a/Changes
  15. +++ b/Changes
  16. @@ -1,3 +1,6 @@
  17. +(N)compress version 5.1
  18. +	* Use modern standard C function prototypes
  19. +
  20.  (N)compress version 5.0
  21.  	* New stream for cleanups
  22.  	* Drop support for 2.0 output & -C option
  23. diff --git a/compress.c b/compress.c
  24. index 66cacf1..691ff2b 100644
  25. --- a/compress.c
  26. +++ b/compress.c
  27. @@ -168,12 +168,6 @@
  28.  	};
  29.  #endif
  30.  
  31. -#ifdef	__STDC__
  32. -#	define	ARGS(a)				a
  33. -#else
  34. -#	define	ARGS(a)				()
  35. -#endif
  36. -
  37.  #ifndef SIG_TYPE
  38.  #	define	SIG_TYPE	void (*)()
  39.  #endif
  40. @@ -527,17 +521,16 @@ long 			bytes_out;			/* Total number of byte to output				*/
  41.  	} ;
  42.  #endif
  43.  
  44. -int  	main			ARGS((int,char **));
  45. -void  	Usage			ARGS((int));
  46. -void  	comprexx		ARGS((const char *));
  47. -void  	compdir			ARGS((char *));
  48. -void  	compress		ARGS((int,int));
  49. -void  	decompress		ARGS((int,int));
  50. -void  	read_error		ARGS((void));
  51. -void  	write_error		ARGS((void));
  52. -void 	abort_compress	ARGS((void));
  53. -void  	prratio			ARGS((FILE *,long,long));
  54. -void  	about			ARGS((void));
  55. +void  	Usage			(int);
  56. +void  	comprexx		(const char *);
  57. +void  	compdir			(char *);
  58. +void  	compress		(int, int);
  59. +void  	decompress		(int, int);
  60. +void  	read_error		(void);
  61. +void  	write_error		(void);
  62. +void 	abort_compress	(void);
  63. +void  	prratio			(FILE *, long, long);
  64. +void  	about			(void);
  65.  
  66.  /*****************************************************************
  67.   * TAG( main )
  68. @@ -580,9 +573,7 @@ void  	about			ARGS((void));
  69.   *   procedure needs no input table, but tracks the way the table was built.
  70.   */ 
  71.  int
  72. -main(argc, argv)
  73. -	int 	 argc;
  74. -	char	*argv[];
  75. +main(int argc, char *argv[])
  76.  	{
  77.  		char **filelist;
  78.  		char **fileptr;
  79. @@ -794,8 +785,7 @@ Usage: %s [-dfhvcVr] [-b maxbits] [--] [path ...]\n\
  80.  	}
  81.  
  82.  void
  83. -comprexx(fileptr)
  84. -	const char	*fileptr;
  85. +comprexx(const char	*fileptr)
  86.  	{
  87.  		int				 fdin = -1;
  88.  		int				 fdout = -1;
  89. @@ -1144,8 +1134,7 @@ error:
  90.  
  91.  #ifdef	RECURSIVE
  92.  void
  93. -compdir(dir)
  94. -	char	*dir;
  95. +compdir(char *dir)
  96.  	{
  97.  		struct dirent *dp;
  98.  		DIR *dirp;
  99. @@ -1221,9 +1210,7 @@ compdir(dir)
  100.   * questions about this implementation to ames!jaw.
  101.   */
  102.  void
  103. -compress(fdin, fdout)
  104. -	int		fdin;
  105. -	int		fdout;
  106. +compress(int fdin, int fdout)
  107.  	{
  108.  		long hp;
  109.  		int rpos;
  110. @@ -1460,9 +1447,7 @@ endlop:			if (fcode.e.ent >= FIRST && rpos < rsize)
  111.   */
  112.  
  113.  void
  114. -decompress(fdin, fdout)
  115. -	int		fdin;
  116. -	int		fdout;
  117. +decompress(int fdin, int fdout)
  118.  	{
  119.  		char_type *stackp;
  120.  		code_int code;
  121. @@ -1687,7 +1672,7 @@ resetbuf:	;
  122.  	}
  123.  
  124.  void
  125. -read_error()
  126. +read_error(void)
  127.  	{
  128.  		fprintf(stderr, "\nread error on");
  129.  	    perror((ifname[0] != '\0') ? ifname : "stdin");
  130. @@ -1695,7 +1680,7 @@ read_error()
  131.  	}
  132.  
  133.  void
  134. -write_error()
  135. +write_error(void)
  136.  	{
  137.  		fprintf(stderr, "\nwrite error on");
  138.  	    perror(ofname ? ofname : "stdout");
  139. @@ -1703,7 +1688,7 @@ write_error()
  140.  	}
  141.  
  142.  void
  143. -abort_compress()
  144. +abort_compress(void)
  145.  	{
  146.  		if (remove_ofname)
  147.  	    	unlink(ofname);
  148. @@ -1712,10 +1697,7 @@ abort_compress()
  149.  	}
  150.  
  151.  void
  152. -prratio(stream, num, den)
  153. -	FILE		*stream;
  154. -	long int	 num;
  155. -	long int	 den;
  156. +prratio(FILE *stream, long int num, long int den)
  157.  	{
  158.  		int q;			/* Doesn't need to be long */
  159.  
  160. @@ -1739,7 +1721,7 @@ prratio(stream, num, den)
  161.  	}
  162.  
  163.  void
  164. -about()
  165. +about(void)
  166.  	{
  167.  		printf("Compress version: %s\n", version_id);
  168.  		printf("Compile options:\n        ");
  169. -- 
  170. 2.49.0