* lisp/cedet/semantic/{db-el,symref}.el: Mark unused vars

* lisp/cedet/semantic/db-el.el: Use _ to mark unused vars.
(object-print): Use cl-call-next-method instead of call-next-method.
* lisp/cedet/semantic/symref.el: Use _ to mark unused vars.

2 files changed, 23 insertions, 25 deletions

diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el
index e7858ce36b5..413996a5e8f 100644
--- a/lisp/cedet/semantic/db-el.el
+++ b/lisp/cedet/semantic/db-el.el
@@ -44,19 +44,19 @@
    )
   "A table for returning search results from Emacs.")
 
-(cl-defmethod semanticdb-refresh-table ((obj semanticdb-table-emacs-lisp) &optional force)
+(cl-defmethod semanticdb-refresh-table ((_obj semanticdb-table-emacs-lisp) &optional _force)
   "Do not refresh Emacs Lisp table.
 It does not need refreshing."
   nil)
 
-(cl-defmethod semanticdb-needs-refresh-p ((obj semanticdb-table-emacs-lisp))
+(cl-defmethod semanticdb-needs-refresh-p ((_obj semanticdb-table-emacs-lisp))
   "Return nil, we never need a refresh."
   nil)
 
 (cl-defmethod object-print ((obj semanticdb-table-emacs-lisp) &rest strings)
   "Pretty printer extension for `semanticdb-table-emacs-lisp'.
 Adds the number of tags in this file to the object print name."
-  (apply 'call-next-method obj (cons " (proxy)" strings)))
+  (apply #'cl-call-next-method obj (cons " (proxy)" strings)))
 
 (defclass semanticdb-project-database-emacs-lisp
   (semanticdb-project-database eieio-singleton)
@@ -71,10 +71,10 @@ Adds the number of tags in this file to the object print name."
   "Pretty printer extension for `semanticdb-table-emacs-lisp'.
 Adds the number of tags in this file to the object print name."
   (let ((count 0))
-    (mapatoms (lambda (sym) (setq count (1+ count))))
-    (apply 'call-next-method obj (cons 
-				  (format " (%d known syms)" count)
-				  strings))))
+    (mapatoms (lambda (_sym) (setq count (1+ count))))
+    (apply #'cl-call-next-method obj (cons
+                                      (format " (%d known syms)" count)
+                                      strings))))
 
 ;; Create the database, and add it to searchable databases for Emacs Lisp mode.
 (defvar-mode-local emacs-lisp-mode semanticdb-project-system-databases
@@ -103,25 +103,25 @@ Create one of our special tables that can act as an intermediary."
       ))
   (cl-call-next-method))
 
-(cl-defmethod semanticdb-file-table ((obj semanticdb-project-database-emacs-lisp) filename)
+(cl-defmethod semanticdb-file-table ((obj semanticdb-project-database-emacs-lisp) _filename)
   "From OBJ, return FILENAME's associated table object.
 For Emacs Lisp, creates a specialized table."
   (car (semanticdb-get-database-tables obj))
   )
 
-(cl-defmethod semanticdb-get-tags ((table semanticdb-table-emacs-lisp ))
+(cl-defmethod semanticdb-get-tags ((_table semanticdb-table-emacs-lisp ))
   "Return the list of tags belonging to TABLE."
   ;; specialty table ?  Probably derive tags at request time.
   nil)
 
-(cl-defmethod semanticdb-equivalent-mode ((table semanticdb-table-emacs-lisp) &optional buffer)
+(cl-defmethod semanticdb-equivalent-mode ((_table semanticdb-table-emacs-lisp) &optional buffer)
   "Return non-nil if TABLE's mode is equivalent to BUFFER.
 Equivalent modes are specified by the `semantic-equivalent-major-modes'
 local variable."
   (with-current-buffer buffer
     (eq (or mode-local-active-mode major-mode) 'emacs-lisp-mode)))
 
-(cl-defmethod semanticdb-full-filename ((obj semanticdb-table-emacs-lisp))
+(cl-defmethod semanticdb-full-filename ((_obj semanticdb-table-emacs-lisp))
   "Fetch the full filename that OBJ refers to.
 For Emacs Lisp system DB, there isn't one."
   nil)
@@ -151,7 +151,7 @@ If Emacs cannot resolve this symbol to a particular file, then return nil."
 		      'defvar)
 		     ))
 	 (sym (intern (semantic-tag-name tag)))
-	 (file (condition-case err
+	 (file (condition-case nil
 		   (symbol-file sym type)
 		 ;; Older [X]Emacs don't have a 2nd argument.
 		 (error (symbol-file sym))))
@@ -169,7 +169,6 @@ If Emacs cannot resolve this symbol to a particular file, then return nil."
 	  (setq file (concat file ".gz"))))
 
       (let* ((tab (semanticdb-file-table-object file))
-	     (alltags (when tab (semanticdb-get-tags tab)))
 	     (newtags (when tab (semanticdb-find-tags-by-name-method
 				 tab (semantic-tag-name tag))))
 	     (match nil))
@@ -248,7 +247,7 @@ TOKTYPE is a hint to the type of tag desired."
   "Variable used to collect `mapatoms' output.")
 
 (cl-defmethod semanticdb-find-tags-by-name-method
-  ((table semanticdb-table-emacs-lisp) name &optional tags)
+  ((_table semanticdb-table-emacs-lisp) name &optional tags)
   "Find all tags named NAME in TABLE.
 Uses `intern-soft' to match NAME to Emacs symbols.
 Return a list of tags."
@@ -269,26 +268,26 @@ Return a list of tags."
 	))))
 
 (cl-defmethod semanticdb-find-tags-by-name-regexp-method
-  ((table semanticdb-table-emacs-lisp) regex &optional tags)
+  ((_table semanticdb-table-emacs-lisp) regex &optional tags)
   "Find all tags with name matching REGEX in TABLE.
 Optional argument TAGS is a list of tags to search.
 Uses `apropos-internal' to find matches.
 Return a list of tags."
   (if tags (cl-call-next-method)
-    (delq nil (mapcar 'semanticdb-elisp-sym->tag
+    (delq nil (mapcar #'semanticdb-elisp-sym->tag
 		      (apropos-internal regex)))))
 
 (cl-defmethod semanticdb-find-tags-for-completion-method
-  ((table semanticdb-table-emacs-lisp) prefix &optional tags)
+  ((_table semanticdb-table-emacs-lisp) prefix &optional tags)
   "In TABLE, find all occurrences of tags matching PREFIX.
 Optional argument TAGS is a list of tags to search.
 Returns a table of all matching tags."
   (if tags (cl-call-next-method)
-    (delq nil (mapcar 'semanticdb-elisp-sym->tag
+    (delq nil (mapcar #'semanticdb-elisp-sym->tag
 		      (all-completions prefix obarray)))))
 
 (cl-defmethod semanticdb-find-tags-by-class-method
-  ((table semanticdb-table-emacs-lisp) class &optional tags)
+  ((_table semanticdb-table-emacs-lisp) _class &optional tags)
   "In TABLE, find all occurrences of tags of CLASS.
 Optional argument TAGS is a list of tags to search.
 Returns a table of all matching tags."
@@ -323,7 +322,7 @@ Like `semanticdb-find-tags-for-completion-method' for Emacs Lisp."
 ;;; Advanced Searches
 ;;
 (cl-defmethod semanticdb-find-tags-external-children-of-type-method
-  ((table semanticdb-table-emacs-lisp) type &optional tags)
+  ((_table semanticdb-table-emacs-lisp) type &optional tags)
   "Find all nonterminals which are child elements of TYPE
 Optional argument TAGS is a list of tags to search.
 Return a list of tags."
@@ -333,7 +332,7 @@ Return a list of tags."
       (let* ((class (intern-soft type))
 	     (taglst (when class
 		       (delq nil
-			     (mapcar 'semanticdb-elisp-sym->tag
+			     (mapcar #'semanticdb-elisp-sym->tag
 				     ;; Fancy eieio function that knows all about
 				     ;; built in methods belonging to CLASS.
 				     (cl-generic-all-functions class)))))
diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el
index a03e99b9886..0c1fe7e449b 100644
--- a/lisp/cedet/semantic/symref.el
+++ b/lisp/cedet/semantic/symref.el
@@ -338,7 +338,7 @@ The symref TOOL should already contain the search criteria."
       )
     ))
 
-(cl-defmethod semantic-symref-perform-search ((tool semantic-symref-tool-baseclass))
+(cl-defmethod semantic-symref-perform-search ((_tool semantic-symref-tool-baseclass))
   "Base search for symref tools should throw an error."
   (error "Symref tool objects must implement `semantic-symref-perform-search'"))
 
@@ -356,7 +356,7 @@ over until it returns nil."
       (nreverse result)))
   )
 
-(cl-defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-baseclass))
+(cl-defmethod semantic-symref-parse-tool-output-one-line ((_tool semantic-symref-tool-baseclass))
   "Base tool output parser is not implemented."
   (error "Symref tool objects must implement `semantic-symref-parse-tool-output-one-line'"))
 
@@ -479,8 +479,7 @@ If there is no database, of if the searchtype is wrong, return nil."
   ;; tagname, tagregexp, tagcompletions
   (if (not (memq searchtype '(tagname tagregexp tagcompletions)))
       nil
-    (let* ((line (car hit))
-	   (file (cdr hit))
+    (let* ((file (cdr hit))
 	   ;; FAIL here vv - don't load is not obeyed if no table found.
 	   (db (semanticdb-file-table-object file t))
 	   (found