[Elftoolchain-developers] Fix compilation on OpenBSD-current and FreeBSD 9.0-Release

[Sunil N. <su...@su...>]

Hello,

On FreeBSD 9.0-Release -Werror causes "nm" compilation to fail without
the braces.

Also fix compilation of "ar" on OpenBSD-current with libarchive-3.0.3.
archive_version function changed in later versions and using
archive_version_string is backward compatible.

Index: nm/nm.c
===================================================================
--- nm/nm.c	(revision 2478)
+++ nm/nm.c	(working copy)
@@ -578,12 +578,13 @@
 	 * In non-POSIX mode, the option is a synonym for the '-A' and
 	 * '--print-file-name' options.
 	 */
-	if (oflag)
+	if (oflag) {
 		if (is_posix)
 			nm_opts.t = RADIX_OCT;
 		else
 			nm_opts.print_name = PRINT_NAME_FULL;
-
+	}
+	
 	assert(nm_opts.sort_fn != NULL && "nm_opts.sort_fn is null");
 	assert(nm_opts.elem_print_fn != NULL &&
 	    "nm_opts.elem_print_fn is null");
Index: ar/ar.c
===================================================================
--- ar/ar.c	(revision 2478)
+++ ar/ar.c	(working copy)
@@ -429,7 +429,8 @@
 static void
 bsdar_version(void)
 {
-	(void)printf("%s (%s, %s)\n", ELFTC_GETPROGNAME(), archive_version(),
+	(void)printf("%s (%s, %s)\n", ELFTC_GETPROGNAME(), archive_version_string(),
 	    elftc_version());
 	exit(EXIT_SUCCESS);
 }