svn commit: r263139 - in head/usr.sbin/bsdconfig: share timezone/share

[Devin Teske]

Author: dteske
Date: Fri Mar 14 02:56:49 2014
New Revision: 263139
URL: http://svnweb.freebsd.org/changeset/base/263139

Log:
  Remove useless NULL string '' in compound strings. Look very closely.

Modified:
  head/usr.sbin/bsdconfig/share/keymap.subr
  head/usr.sbin/bsdconfig/timezone/share/menus.subr

Modified: head/usr.sbin/bsdconfig/share/keymap.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/keymap.subr	Fri Mar 14 02:53:36 2014	(r263138)
+++ head/usr.sbin/bsdconfig/share/keymap.subr	Fri Mar 14 02:56:49 2014	(r263139)
@@ -165,7 +165,7 @@ f_keymap_get_all()
 			marks[keym] = mark
 			name = keym
 			gsub(/[^[:alnum:]_]/, "_", name)
-			gsub(/'\''/, "'\''\\'\'''\''", desc);
+			gsub(/'\''/, "'\''\\'\'\''", desc);
 			printf "f_keymap_checkfile %s && " \
 			       "f_keymap_register %s '\'%s\'' %s %u\n",
 			       keym, name, desc, keym, mark

Modified: head/usr.sbin/bsdconfig/timezone/share/menus.subr
==============================================================================
--- head/usr.sbin/bsdconfig/timezone/share/menus.subr	Fri Mar 14 02:53:36 2014	(r263138)
+++ head/usr.sbin/bsdconfig/timezone/share/menus.subr	Fri Mar 14 02:56:49 2014	(r263139)
@@ -104,7 +104,7 @@ f_make_menus_awk='
 function add_zone_n_to_country_menu(tlc, n)
 {
 	zone_title = ENVIRON["country_" tlc "_descr_" n]
-	gsub(/'\''/, "'\''\\'\'''\''", zone_title)
+	gsub(/'\''/, "'\''\\'\'\''", zone_title)
 	country_menu_list[tlc] = country_menu_list[tlc] \
 		( length(country_menu_list[tlc]) > 0 ? "\n" : "" ) \
 		n " '\''" zone_title "'\''"
@@ -121,7 +121,7 @@ BEGIN {
 	{
 		tlc = countries[cp]
 		title = ENVIRON["country_" tlc "_name"]
-		gsub(/'\''/, "'\''\\'\'''\''", title)
+		gsub(/'\''/, "'\''\\'\'\''", title)
 		nzones = ENVIRON["country_" tlc "_nzones"]
 		if (!nzones)
 		{