vim: src/buffer.c comparison

comparison src/buffer.c @ 15470:55ccc2d353bd v8.1.0743

patch 8.1.0743: giving error messages is not flexible commit https://github.com/vim/vim/commit/f9e3e09fdc93be9f0d47afbc6c7df1188c2a5a0d Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 13 23:38:42 2019 +0100 patch 8.1.0743: giving error messages is not flexible Problem: Giving error messages is not flexible. Solution: Add semsg(). Change argument from "char_u *" to "char *", also for msg() and get rid of most MSG macros. (Ozaki Kiichi, closes #3302) Also make emsg() accept a "char *" argument. Get rid of an enormous number of type casts.

author	Bram Moolenaar <Bram@vim.org>
date	Sun, 13 Jan 2019 23:45:08 +0100
parents	a6330a49e036
children	98c35d312987

comparison

equal deleted inserted replaced

-:bc9b5261ed01
+:55ccc2d353bd
 	 * if there is no memfile at all, exit
 	 * This is OK, since there are no changes to lose.
 	 */
 	if (curbuf == NULL)
 	{
-	    EMSG(_("E82: Cannot allocate any buffer, exiting..."));
+	    emsg(_("E82: Cannot allocate any buffer, exiting..."));
 	    getout(2);
 	}
-	EMSG(_("E83: Cannot allocate buffer, using other one..."));
+	emsg(_("E83: Cannot allocate buffer, using other one..."));
 	enter_buffer(curbuf);
 #ifdef FEAT_SYN_HL
 	if (old_tw != curbuf->b_p_tw)
 	    check_colorcolumn(curwin);
 #endif
 static void
 buf_hashtab_add(buf_T *buf)
 {
 sprintf((char *)buf->b_key, "%x", buf->b_fnum);
 if (hash_add(&buf_hashtab, buf->b_key) == FAIL)
-	EMSG(_("E931: Buffer cannot be registered"));
+	emsg(_("E931: Buffer cannot be registered"));
 }
 static void
 buf_hashtab_remove(buf_T *buf)
 {
 		can_unload = FALSE;
 		break;
 	    }
 }
 if (!can_unload)
-	EMSG(_("E937: Attempt to delete a buffer that is in use"));
+	emsg(_("E937: Attempt to delete a buffer that is in use"));
 return can_unload;
 }
 /*
 * Close the link to a buffer.
 								  FALSE, buf)
 		&& !bufref_valid(&bufref))
 	{
 	    /* Autocommands deleted the buffer. */
 aucmd_abort:
-	    EMSG(_(e_auabort));
+	    emsg(_(e_auabort));
 	    return;
 	}
 	--buf->b_locked;
 	if (abort_if_last && one_window())
 	    /* Autocommands made this the only window. */
 * command can be DOBUF_UNLOAD (":bunload"), DOBUF_WIPE (":bwipeout") or
 * DOBUF_DEL (":bdel")
 *
 * Returns error message or NULL
 */
-char_u *
+char *
 do_bufdel(
 int		command,
 char_u	*arg,		/* pointer to extra arguments */
 int		addr_count,
 int		start_bnr,	/* first buffer number in a range */
 int		end_bnr,	/* buffer nr or last buffer nr in a range */
 int		forceit)
 {
 int		do_current = 0;	/* delete current buffer? */
 int		deleted = 0;	/* number of buffers deleted */
-char_u	*errormsg = NULL; /* return value */
+char	*errormsg = NULL; /* return value */
 int		bnr;		/* buffer number */
 char_u	*p;
 if (addr_count == 0)
 {
 else
 {
 	if (addr_count == 2)
 	{
 	    if (*arg)		/* both range and argument is not allowed */
-		return (char_u *)_(e_trailing);
+		return _(e_trailing);
 	    bnr = start_bnr;
 	}
 	else	/* addr_count == 1 */
 	    bnr = end_bnr;
 		STRCPY(IObuff, _("E515: No buffers were unloaded"));
 	    else if (command == DOBUF_DEL)
 		STRCPY(IObuff, _("E516: No buffers were deleted"));
 	    else
 		STRCPY(IObuff, _("E517: No buffers were wiped out"));
-	    errormsg = IObuff;
+	    errormsg = (char *)IObuff;
 	}
 	else if (deleted >= p_report)
 	{
 	    if (command == DOBUF_UNLOAD)
-		smsg((char_u *)NGETTEXT("%d buffer unloaded",
+		smsg(NGETTEXT("%d buffer unloaded",
 			    "%d buffers unloaded", deleted), deleted);
 	    else if (command == DOBUF_DEL)
-		smsg((char_u *)NGETTEXT("%d buffer deleted",
+		smsg(NGETTEXT("%d buffer deleted",
 			    "%d buffers deleted", deleted), deleted);
 	    else
-		smsg((char_u *)NGETTEXT("%d buffer wiped out",
+		smsg(NGETTEXT("%d buffer wiped out",
 			    "%d buffers wiped out", deleted), deleted);
 	}
 }
 buf_T   *buf = curbuf;
 bufref_T bufref;
 if (action == DOBUF_UNLOAD)
 {
-	EMSG(_("E90: Cannot unload last buffer"));
+	emsg(_("E90: Cannot unload last buffer"));
 	return FAIL;
 }
 set_bufref(&bufref, buf);
 if (close_others)
 	    }
 	    while (buf != curbuf && !bufIsChanged(buf));
 	}
 	if (!bufIsChanged(buf))
 	{
-	    EMSG(_("E84: No modified buffer found"));
+	    emsg(_("E84: No modified buffer found"));
 	    return FAIL;
 	}
 }
 else if (start == DOBUF_FIRST && count) /* find specified buffer number */
 {
 		 bp = NULL;	/* use this buffer as new starting point */
 	    }
 	    if (bp == buf)
 	    {
 		/* back where we started, didn't find anything. */
-		EMSG(_("E85: There is no listed buffer"));
+		emsg(_("E85: There is no listed buffer"));
 		return FAIL;
 	    }
 	}
 }
 {
 	if (start == DOBUF_FIRST)
 	{
 	    /* don't warn when deleting */
 	    if (!unload)
-		EMSGN(_(e_nobufnr), count);
+		semsg(_(e_nobufnr), count);
 	}
 	else if (dir == FORWARD)
-	    EMSG(_("E87: Cannot go beyond last buffer"));
+	    emsg(_("E87: Cannot go beyond last buffer"));
 	else
-	    EMSG(_("E88: Cannot go before first buffer"));
+	    emsg(_("E88: Cannot go before first buffer"));
 	return FAIL;
 }
 #ifdef FEAT_GUI
 need_mouse_correct = TRUE;
 		    return FAIL;
 	    }
 	    else
 #endif
 	    {
-		EMSGN(_("E89: No write since last change for buffer %ld (add ! to override)"),
+		semsg(_("E89: No write since last change for buffer %ld (add ! to override)"),
 								 buf->b_fnum);
 		return FAIL;
 	    }
 	}
 void
 no_write_message(void)
 {
 #ifdef FEAT_TERMINAL
 if (term_job_running(curbuf->b_term))
-	EMSG(_("E948: Job still running (add ! to end the job)"));
+	emsg(_("E948: Job still running (add ! to end the job)"));
 else
 #endif
-	EMSG(_("E37: No write since last change (add ! to override)"));
+	emsg(_("E37: No write since last change (add ! to override)"));
 }
 void
 no_write_message_nobang(buf_T *buf UNUSED)
 {
 #ifdef FEAT_TERMINAL
 if (term_job_running(buf->b_term))
-	EMSG(_("E948: Job still running"));
+	emsg(_("E948: Job still running"));
 else
 #endif
-	EMSG(_("E37: No write since last change"));
+	emsg(_("E37: No write since last change"));
 }
 /*
 * functions for dealing with the buffer list
 */
 	lastbuf = buf;
 	buf->b_fnum = top_file_num++;
 	if (top_file_num < 0)		/* wrap around (may cause duplicates) */
 	{
-	    EMSG(_("W14: Warning: List of file names overflow"));
+	    emsg(_("W14: Warning: List of file names overflow"));
 	    if (emsg_silent == 0)
 	    {
 		out_flush();
 		ui_delay(3000L, TRUE);	/* make sure it is noticed */
 	    }
 buf = buflist_findnr(n);
 if (buf == NULL)
 {
 	if ((options & GETF_ALT) && n == 0)
-	    EMSG(_(e_noalt));
+	    emsg(_(e_noalt));
 	else
-	    EMSGN(_("E92: Buffer %ld not found"), n);
+	    semsg(_("E92: Buffer %ld not found"), n);
 	return FAIL;
 }
 /* if alternate file is the current buffer, nothing to do */
 if (buf == curbuf)
 	vim_free(pat);
 }
 if (match == -2)
-	EMSG2(_("E93: More than one match for %s"), pattern);
+	semsg(_("E93: More than one match for %s"), pattern);
 else if (match < 0)
-	EMSG2(_("E94: No matching buffer for %s"), pattern);
+	semsg(_("E94: No matching buffer for %s"), pattern);
 return match;
 }
 #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
 	if (obuf != NULL && obuf != buf)
 	{
 	    if (obuf->b_ml.ml_mfp != NULL)	/* it's loaded, fail */
 	    {
 		if (message)
-		    EMSG(_("E95: Buffer with this name already exists"));
+		    emsg(_("E95: Buffer with this name already exists"));
 		vim_free(ffname);
 		return FAIL;
 	    }
 	    /* delete from the list */
 	    close_buffer(NULL, obuf, DOBUF_WIPE, FALSE);
 linenr_T	dummy;
 if (buflist_name_nr(0, &fname, &dummy) == FAIL)
 {
 	if (errmsg)
-	    EMSG(_(e_noalt));
+	    emsg(_(e_noalt));
 	return NULL;
 }
 return fname;
 }
 int
 bt_dontwrite_msg(buf_T *buf)
 {
 if (bt_dontwrite(buf))
 {
-	EMSG(_("E382: Cannot write, 'buftype' option is set"));
+	emsg(_("E382: Cannot write, 'buftype' option is set"));
 	return TRUE;
 }
 return FALSE;
 }

Mercurial > vim

comparison src/buffer.c @ 15470:55ccc2d353bd v8.1.0743