vim: src/tag.c comparison

comparison src/tag.c @ 7835:4d7ce6c03fda v7.4.1214

commit https://github.com/vim/vim/commit/764b23c8fd3369cb05ae9122abf3ca16fec539d7 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 30 21:10:09 2016 +0100 patch 7.4.1214 Problem: Using old style function declarations. Solution: Change to new style function declarations. (script by Hirohito Higashi)

author	Christian Brabandt <cb@256bit.org>
date	Sat, 30 Jan 2016 21:15:04 +0100
parents	0b6c37dd858d
children	2f57bbe870ea

comparison

equal deleted inserted replaced

-:2d1dc9ec41ce
+:4d7ce6c03fda
 * type == DT_FREE:	free cached matches
 *
 * for cscope, returns TRUE if we jumped to tag or aborted, FALSE otherwise
 */
 int
-do_tag(tag, type, count, forceit, verbose)
+do_tag(
-char_u	*tag;		/* tag (pattern) to jump to */
+char_u	*tag,		/* tag (pattern) to jump to */
-int		type;
+int		type,
-int		count;
+int		count,
-int		forceit;	/* :ta with ! */
+int		forceit,	/* :ta with ! */
-int		verbose;	/* print "tag not found" message */
+int		verbose)	/* print "tag not found" message */
 {
 taggy_T	*tagstack = curwin->w_tagstack;
 int		tagstackidx = curwin->w_tagstackidx;
 int		tagstacklen = curwin->w_tagstacklen;
 int		cur_match = 0;
 /*
 * Free cached tags.
 */
 void
-tag_freematch()
+tag_freematch(void)
 {
 vim_free(tagmatchname);
 tagmatchname = NULL;
 }
 static void
-taglen_advance(l)
+taglen_advance(int l)
-int		l;
 {
 if (l == MAXCOL)
 {
 	msg_putchar('\n');
 	msg_advance(24);
 /*
 * Print the tag stack
 */
 void
-do_tags(eap)
+do_tags(exarg_T *eap UNUSED)
-exarg_T	*eap UNUSED;
 {
 int		i;
 char_u	*name;
 taggy_T	*tagstack = curwin->w_tagstack;
 int		tagstackidx = curwin->w_tagstackidx;
 * Compare two strings, for length "len", ignoring case the ASCII way.
 * return 0 for match, < 0 for smaller, > 0 for bigger
 * Make sure case is folded to uppercase in comparison (like for 'sort -f')
 */
 static int
-tag_strnicmp(s1, s2, len)
+tag_strnicmp(char_u *s1, char_u *s2, size_t len)
-char_u	*s1;
-char_u	*s2;
-size_t	len;
 {
 int		i;
 while (len > 0)
 {
 /*
 * Extract info from the tag search pattern "pats->pat".
 */
 static void
-prepare_pats(pats, has_re)
+prepare_pats(pat_T *pats, int has_re)
-pat_T	*pats;
-int		has_re;
 {
 pats->head = pats->pat;
 pats->headlen = pats->len;
 if (has_re)
 {
 * TAG_REGEXP	  use "pat" as a regexp
 * TAG_NOIC	  don't always ignore case
 * TAG_KEEP_LANG  keep language
 */
 int
-find_tags(pat, num_matches, matchesp, flags, mincount, buf_ffname)
+find_tags(
-char_u	*pat;			/* pattern to search for */
+char_u	*pat,			/* pattern to search for */
-int		*num_matches;		/* return: number of matches found */
+int		*num_matches,		/* return: number of matches found */
-char_u	***matchesp;		/* return: array of matches found */
+char_u	***matchesp,		/* return: array of matches found */
-int		flags;
+int		flags,
-int		mincount;		/*  MAXCOL: find all matches
+int		mincount,		/*  MAXCOL: find all matches
 					     other: minimal number of matches */
-char_u	*buf_ffname;		/* name of buffer for priority */
+char_u	*buf_ffname)		/* name of buffer for priority */
 {
 FILE       *fp;
 char_u     *lbuf;			/* line buffer */
 int		lbuf_size = LSIZE;	/* length of lbuf */
 char_u     *tag_fname;		/* name of tag file */
 /*
 * Callback function for finding all "tags" and "tags-??" files in
 * 'runtimepath' doc directories.
 */
 static void
-found_tagfile_cb(fname, cookie)
+found_tagfile_cb(char_u *fname, void *cookie UNUSED)
-char_u	*fname;
-void	*cookie UNUSED;
 {
 if (ga_grow(&tag_fnames, 1) == OK)
 	((char_u **)(tag_fnames.ga_data))[tag_fnames.ga_len++] =
 							   vim_strsave(fname);
 }
 #if defined(EXITFREE) || defined(PROTO)
 void
-free_tag_stuff()
+free_tag_stuff(void)
 {
 ga_clear_strings(&tag_fnames);
 do_tag(NULL, DT_FREE, 0, 0, 0);
 tag_freematch();
 * For help files, use "tags" file only.
 *
 * Return FAIL if no more tag file names, OK otherwise.
 */
 int
-get_tagfname(tnp, first, buf)
+get_tagfname(
-tagname_T	*tnp;	/* holds status info */
+tagname_T	*tnp,	/* holds status info */
-int		first;	/* TRUE when first file name is wanted */
+int		first,	/* TRUE when first file name is wanted */
-char_u	*buf;	/* pointer to buffer of MAXPATHL chars */
+char_u	*buf)	/* pointer to buffer of MAXPATHL chars */
 {
 char_u		*fname = NULL;
 char_u		*r_ptr;
 if (first)
 /*
 * Free the contents of a tagname_T that was filled by get_tagfname().
 */
 void
-tagname_free(tnp)
+tagname_free(tagname_T *tnp)
-tagname_T	*tnp;
 {
 vim_free(tnp->tn_tags);
 vim_findfile_cleanup(tnp->tn_search_ctx);
 tnp->tn_search_ctx = NULL;
 ga_clear_strings(&tag_fnames);
 * If is_etag is TRUE, tagp->fname and tagp->fname_end are not set.
 *
 * Return FAIL if there is a format error in this line, OK otherwise.
 */
 static int
-parse_tag_line(lbuf,
+parse_tag_line(
+char_u	*lbuf,		/* line to be parsed */
 #ifdef FEAT_EMACS_TAGS
-		    is_etag,
+int		is_etag,
 #endif
-			      tagp)
+tagptrs_T	*tagp)
-char_u	*lbuf;		/* line to be parsed */
-#ifdef FEAT_EMACS_TAGS
-int		is_etag;
-#endif
-tagptrs_T	*tagp;
 {
 char_u	*p;
 #ifdef FEAT_EMACS_TAGS
 char_u	*p_7f;
 *
 * Return TRUE if it is a static tag and adjust *tagname to the real tag.
 * Return FALSE if it is not a static tag.
 */
 static int
-test_for_static(tagp)
+test_for_static(tagptrs_T *tagp)
-tagptrs_T	*tagp;
 {
 char_u	*p;
 #ifdef FEAT_TAG_OLDSTATIC
 int		len;
 * without Emacs tags: <mtt><tag_fname><NUL><lbuf>
 *
 * Return OK or FAIL.
 */
 static int
-parse_match(lbuf, tagp)
+parse_match(
-char_u	*lbuf;	    /* input: matching line */
+char_u	*lbuf,	    /* input: matching line */
-tagptrs_T	*tagp;	    /* output: pointers into the line */
+tagptrs_T	*tagp)	    /* output: pointers into the line */
 {
 int		retval;
 char_u	*p;
 char_u	*pc, *pt;
 * Find out the actual file name of a tag.  Concatenate the tags file name
 * with the matching tag file name.
 * Returns an allocated string or NULL (out of memory).
 */
 static char_u *
-tag_full_fname(tagp)
+tag_full_fname(tagptrs_T *tagp)
-tagptrs_T	*tagp;
 {
 char_u	*fullname;
 int		c;
 #ifdef FEAT_EMACS_TAGS
 * Jump to a tag that has been found in one of the tag files
 *
 * returns OK for success, NOTAGFILE when file not found, FAIL otherwise.
 */
 static int
-jumpto_tag(lbuf, forceit, keep_help)
+jumpto_tag(
-char_u	*lbuf;		/* line from the tags file for this tag */
+char_u	*lbuf,		/* line from the tags file for this tag */
-int		forceit;	/* :ta with ! */
+int		forceit,	/* :ta with ! */
-int		keep_help;	/* keep help flag (FALSE for cscope) */
+int		keep_help)	/* keep help flag (FALSE for cscope) */
 {
 int		save_secure;
 int		save_magic;
 int		save_p_ws, save_p_scs, save_p_ic;
 linenr_T	save_lnum;
 * If 'tagrelative' option set, change fname (name of file containing tag)
 * according to tag_fname (name of tag file containing fname).
 * Returns a pointer to allocated memory (or NULL when out of memory).
 */
 static char_u *
-expand_tag_fname(fname, tag_fname, expand)
+expand_tag_fname(char_u *fname, char_u *tag_fname, int expand)
-char_u	*fname;
-char_u	*tag_fname;
-int		expand;
 {
 char_u	*p;
 char_u	*retval;
 char_u	*expanded_fname = NULL;
 expand_T	xpc;
 * its simplest form by stripping out unneeded components, if any.  The
 * resulting file name is simplified in place and will either be the same
 * length as that supplied, or shorter.
 */
 void
-simplify_filename(filename)
+simplify_filename(char_u *filename)
-char_u	*filename;
 {
 #ifndef AMIGA	    /* Amiga doesn't have "..", it uses "/" */
 int		components = 0;
 char_u	*p, *tail, *start;
 int		stripping_disabled = FALSE;
 * This is a bit slow, because of the full path compare in fullpathcmp().
 * Return TRUE if tag for file "fname" if tag file "tag_fname" is for current
 * file.
 */
 static int
+test_for_current(
 #ifdef FEAT_EMACS_TAGS
-test_for_current(is_etag, fname, fname_end, tag_fname, buf_ffname)
+int	    is_etag,
-int	    is_etag;
+#endif
-#else
+char_u  *fname,
-test_for_current(fname, fname_end, tag_fname, buf_ffname)
+char_u  *fname_end,
-#endif
+char_u  *tag_fname,
-char_u  *fname;
+char_u  *buf_ffname)
-char_u  *fname_end;
-char_u  *tag_fname;
-char_u  *buf_ffname;
 {
 int	    c;
 int	    retval = FALSE;
 char_u  *fullname;
 /*
 * Find the end of the tagaddress.
 * Return OK if ";\"" is following, FAIL otherwise.
 */
 static int
-find_extra(pp)
+find_extra(char_u **pp)
-char_u	**pp;
 {
 char_u	*str = *pp;
 /* Repeat for addresses separated with ';' */
 for (;;)
 return FAIL;
 }
 #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
 int
-expand_tags(tagnames, pat, num_file, file)
+expand_tags(
-int		tagnames;	/* expand tag names */
+int		tagnames,	/* expand tag names */
-char_u	*pat;
+char_u	*pat,
-int		*num_file;
+int		*num_file,
-char_u	***file;
+char_u	***file)
 {
 int		i;
 int		c;
 int		tagnmflag;
 char_u      tagnm[100];
 /*
 * Add a tag field to the dictionary "dict".
 * Return OK or FAIL.
 */
 static int
-add_tag_field(dict, field_name, start, end)
+add_tag_field(
-dict_T  *dict;
+dict_T  *dict,
-char    *field_name;
+char    *field_name,
-char_u  *start;		/* start of the value */
+char_u  *start,		/* start of the value */
-char_u  *end;		/* after the value; can be NULL */
+char_u  *end)		/* after the value; can be NULL */
 {
 char_u	*buf;
 int		len = 0;
 int		retval;
 /*
 * Add the tags matching the specified pattern to the list "list"
 * as a dictionary
 */
 int
-get_tags(list, pat)
+get_tags(list_T *list, char_u *pat)
-list_T *list;
-char_u *pat;
 {
 int		num_matches, i, ret;
 char_u	**matches, *p;
 char_u	*full_fname;
 dict_T	*dict;

Mercurial > vim

comparison src/tag.c @ 7835:4d7ce6c03fda v7.4.1214