Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Jan 2017 18:31:52 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r312769 - stable/11/sys/boot/efi/boot1
Message-ID:  <201701251831.v0PIVqXE048628@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Wed Jan 25 18:31:51 2017
New Revision: 312769
URL: https://svnweb.freebsd.org/changeset/base/312769

Log:
  MFC r311933:
  
  Use proper prototypes in struct boot_module_t
  
  With clang 4.0.0, we are getting the following warnings about struct
  boot_module_t in efi's boot_module.h:
  
  In file included from sys/boot/efi/boot1/ufs_module.c:41:
  sys/boot/efi/boot1/boot_module.h:67:14: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]
          void (*init)();
                      ^
                       void
  sys/boot/efi/boot1/boot_module.h:92:16: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]
          void (*status)();
                        ^
                         void
  sys/boot/efi/boot1/boot_module.h:95:24: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]
          dev_info_t *(*devices)();
                                ^
                                 void
  3 errors generated.
  
  Fix this by adding 'void' to the parameter lists.  No functional change.
  
  Reviewed by:	emaste, imp, smh
  Differential Revision:	https://reviews.freebsd.org/D9144

Modified:
  stable/11/sys/boot/efi/boot1/boot_module.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/boot/efi/boot1/boot_module.h
==============================================================================
--- stable/11/sys/boot/efi/boot1/boot_module.h	Wed Jan 25 18:21:49 2017	(r312768)
+++ stable/11/sys/boot/efi/boot1/boot_module.h	Wed Jan 25 18:31:51 2017	(r312769)
@@ -64,7 +64,7 @@ typedef struct boot_module_t
 	const char *name;
 
 	/* init is the optional initialiser for the module. */
-	void (*init)();
+	void (*init)(void);
 
 	/*
 	 * probe checks to see if the module can handle dev.
@@ -89,10 +89,10 @@ typedef struct boot_module_t
 	    void **buf, size_t *bufsize);
 
 	/* status outputs information about the probed devices. */
-	void (*status)();
+	void (*status)(void);
 
 	/* valid devices as found by probe. */
-	dev_info_t *(*devices)();
+	dev_info_t *(*devices)(void);
 } boot_module_t;
 
 /* Standard boot modules. */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701251831.v0PIVqXE048628>