svn commit: r327163 - head/usr.sbin/efibootmgr

[Alexander Kabaev]

Author: kan
Date: Sun Dec 24 16:39:57 2017
New Revision: 327163
URL: https://svnweb.freebsd.org/changeset/base/327163

Log:
  Remove write-only opt and useless optlen variables.
  
  This squashes the warning gebnerated by GCC 6.x. Since
  variables that are now removed had come documentation
  value, put relevant bits in comment, so they can be
  resurrected from there when actually needed.

Modified:
  head/usr.sbin/efibootmgr/efibootmgr.c

Modified: head/usr.sbin/efibootmgr/efibootmgr.c
==============================================================================
--- head/usr.sbin/efibootmgr/efibootmgr.c	Sun Dec 24 16:36:50 2017	(r327162)
+++ head/usr.sbin/efibootmgr/efibootmgr.c	Sun Dec 24 16:39:57 2017	(r327163)
@@ -707,10 +707,8 @@ print_loadopt_str(uint8_t *data, size_t datalen)
 	uint8_t *ep = data + datalen;
 	uint8_t *walker = data;
 	efidp dp, edp;
-	void *opt;
 	char buf[1024];
 	int len;
-	int optlen;
 	int rv;
 	int indent;
 
@@ -734,10 +732,11 @@ print_loadopt_str(uint8_t *data, size_t datalen)
 	if (walker > ep)
 		return;
 	edp = (efidp)walker;
-	// Everything left is the binary option args
-	opt = walker;
-	optlen = ep - walker;
-
+	/*
+	 * Everything left is the binary option args
+	 * opt = walker;
+	 * optlen = ep - walker;
+	 */
 	indent = 1;
 	while (dp < edp) {
 		efidp_format_device_path(buf, sizeof(buf), dp,
@@ -753,8 +752,6 @@ print_loadopt_str(uint8_t *data, size_t datalen)
 		}
 		dp = (efidp)((char *)dp + efidp_size(dp));
 	}
-	if (optlen == 0)
-		return;
 }
 
 static char *