summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-07-01 09:34:31 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-07-01 09:34:31 +0300
commit6dc1bc3a5822007cdb2d5b79f0a37b4d6b9b65c7 (patch)
treebd405e3505214659b773f0ffcb2d62f8d3b5b3e5
parente34f8781397ed451a84c1a3fdc5766c5b1e28d41 (diff)
downloadmariadb-git-6dc1bc3a5822007cdb2d5b79f0a37b4d6b9b65c7.tar.gz
Fix clang-15 -Wdeprecated-non-prototype
K&R style function definitions are deprecated in all versions of C and not supported in C2x.
-rw-r--r--dbug/my_main.c4
-rw-r--r--extra/replace.c19
2 files changed, 7 insertions, 16 deletions
diff --git a/dbug/my_main.c b/dbug/my_main.c
index 2b3e92b53cc..80db4d82e06 100644
--- a/dbug/my_main.c
+++ b/dbug/my_main.c
@@ -7,9 +7,7 @@
#include <my_sys.h>
#include <my_pthread.h>
-int main (argc, argv)
-int argc;
-char *argv[];
+int main (int argc, char **argv)
{
register int result, ix;
extern int factorial(int);
diff --git a/extra/replace.c b/extra/replace.c
index 717bc92d0c4..a5c470b0b68 100644
--- a/extra/replace.c
+++ b/extra/replace.c
@@ -148,9 +148,7 @@ int main(int argc, char *argv[])
/* reads options */
/* Initiates DEBUG - but no debugging here ! */
-static int static_get_options(argc,argv)
-register int *argc;
-register char **argv[];
+static int static_get_options(int *argc, char***argv)
{
int help,version;
char *pos;
@@ -218,10 +216,9 @@ register char **argv[];
} /* static_get_options */
-static int get_replace_strings(argc,argv,from_array,to_array)
-register int *argc;
-register char **argv[];
-POINTER_ARRAY *from_array,*to_array;
+static int get_replace_strings(int *argc, char ***argv,
+ POINTER_ARRAY *from_array,
+ POINTER_ARRAY *to_array)
{
char *pos;
@@ -965,9 +962,7 @@ static void free_buffer()
bytes read from disk.
*/
-static int fill_buffer_retaining(fd,n)
-File fd;
-int n;
+static int fill_buffer_retaining(File fd, int n)
{
int i;
@@ -1010,9 +1005,7 @@ int n;
/* Return 0 if convert is ok */
/* Global variable update is set if something was changed */
-static int convert_pipe(rep,in,out)
-REPLACE *rep;
-FILE *in,*out;
+static int convert_pipe(REPLACE *rep, FILE *in, FILE *out)
{
int retain,error;
uint length;