|
 |
73b847 |
From e0344288b01f66bf4b600468692a1110c8abbe24 Mon Sep 17 00:00:00 2001
|
|
|
73b847 |
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
|
|
|
73b847 |
Date: Wed, 4 Dec 2019 13:13:14 +0100
|
|
|
73b847 |
Subject: [PATCH 075/181] nbis/log: Don't use old-style function declarations
|
|
|
73b847 |
|
|
|
73b847 |
---
|
|
|
73b847 |
libfprint/nbis/mindtct/log.c | 4 ++--
|
|
|
73b847 |
libfprint/nbis/update-from-nbis.sh | 6 +++++-
|
|
|
73b847 |
2 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
73b847 |
|
|
|
73b847 |
diff --git a/libfprint/nbis/mindtct/log.c b/libfprint/nbis/mindtct/log.c
|
|
|
73b847 |
index b1dcaad..dcd3db7 100644
|
|
|
73b847 |
--- a/libfprint/nbis/mindtct/log.c
|
|
|
73b847 |
+++ b/libfprint/nbis/mindtct/log.c
|
|
|
73b847 |
@@ -66,7 +66,7 @@ of the software.
|
|
|
73b847 |
|
|
|
73b847 |
/***************************************************************************/
|
|
|
73b847 |
/***************************************************************************/
|
|
|
73b847 |
-int open_logfile()
|
|
|
73b847 |
+int open_logfile(void)
|
|
|
73b847 |
{
|
|
|
73b847 |
#ifdef LOG_REPORT
|
|
|
73b847 |
fprintf(stderr, "ERROR : open_logfile : fopen : %s\n", LOG_FILE);
|
|
|
73b847 |
@@ -91,7 +91,7 @@ void print2log(char *fmt, ...)
|
|
|
73b847 |
|
|
|
73b847 |
/***************************************************************************/
|
|
|
73b847 |
/***************************************************************************/
|
|
|
73b847 |
-int close_logfile()
|
|
|
73b847 |
+int close_logfile(void)
|
|
|
73b847 |
{
|
|
|
73b847 |
#ifdef LOG_REPORT
|
|
|
73b847 |
fprintf(stderr, "ERROR : close_logfile : fclose : %s\n", LOG_FILE);
|
|
|
73b847 |
diff --git a/libfprint/nbis/update-from-nbis.sh b/libfprint/nbis/update-from-nbis.sh
|
|
|
73b847 |
index c8cde80..742c8cb 100755
|
|
|
73b847 |
--- a/libfprint/nbis/update-from-nbis.sh
|
|
|
73b847 |
+++ b/libfprint/nbis/update-from-nbis.sh
|
|
|
73b847 |
@@ -179,9 +179,13 @@ sed -i 's/[ \t]*$//' `find -name "*.[ch]"`
|
|
|
73b847 |
# Remove usebsd.h
|
|
|
73b847 |
sed -i '/usebsd.h/d' `find -name "*.[ch]"`
|
|
|
73b847 |
|
|
|
73b847 |
+# Replace functions with empty parameters using (void)
|
|
|
73b847 |
+sed -i 's/^\([[:space:]]*[[:alnum:]_]\+[\*[:space:]]\+'\
|
|
|
73b847 |
+'[[:alnum:]_]\+[[:space:]]*\)([[:space:]]*)/\1(void)/g' `find -name "*.[ch]"`
|
|
|
73b847 |
+
|
|
|
73b847 |
# Use GLib memory management
|
|
|
73b847 |
spatch --sp-file glib-memory.cocci --dir . --in-place
|
|
|
73b847 |
|
|
|
73b847 |
# The above leaves an unused variable around, triggering a warning
|
|
|
73b847 |
# remove it.
|
|
|
73b847 |
-patch -p0 < glib-mem-warning.patch
|
|
|
73b847 |
\ No newline at end of file
|
|
|
73b847 |
+patch -p0 < glib-mem-warning.patch
|
|
|
73b847 |
--
|
|
|
73b847 |
2.24.1
|
|
|
73b847 |
|