From: Dirk Gouders <dirk@gouders.net>
Date: Sat, 16 Aug 2014 05:56:58 +0000 (+0200)
Subject: scripts/tags.sh: fix DEFINE_HASHTABLE in emacs case
X-Git-Tag: v3.18-rc1~45^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8e170655b517ba49bf4d015008474bcc2f425b20;p=karo-tx-linux.git

scripts/tags.sh: fix DEFINE_HASHTABLE in emacs case

The emacs --regex for DEFINE_HASHTABLE produced a warning because of
an unmatched '\('.  Further, the whole entry did not work, because the
regex needs to match from the beginning of a line, including keywords
like 'static'.  Finally, '\w' should not be used, because it
stops at underscores which are often part of variable names in C,
resulting in wrong entries in the tags file.

Signed-off-by: Dirk Gouders <dirk@gouders.net>
Inspired-by: Masatake YAMATO <yamato@redhat.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
---

diff --git a/scripts/tags.sh b/scripts/tags.sh
index 0f61bd7ee958..fd651f90a838 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -255,7 +255,7 @@ emacs()
 	--regex='/_PE(\([^,)]*\).*/PEVENT_ERRNO__\1/'		\
 	--regex='/PCI_OP_READ(\([a-z]*[a-z]\).*[1-4])/pci_bus_read_config_\1/' \
 	--regex='/PCI_OP_WRITE(\([a-z]*[a-z]\).*[1-4])/pci_bus_write_config_\1/'\
-	--regex='/DEFINE_HASHTABLE\((\w*)/\1/'
+	--regex='/[^#]*DEFINE_HASHTABLE(\([^,)]*\)/\1/'
 
 	all_kconfigs | xargs $1 -a                              \
 	--regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'