vim: src/memline.c comparison

comparison src/memline.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	58b125df3e9b
children	dd725a8ab112

comparison

equal deleted inserted replaced

-:bc9b5261ed01
+:55ccc2d353bd
 * Do ":help credits" in Vim to see a list of people who contributed.
 * See README.txt for an overview of the Vim source code.
 */
 /* for debugging */
-/* #define CHECK(c, s)	do { if (c) EMSG(s); } while (0) */
+/* #define CHECK(c, s)	do { if (c) emsg((s)); } while (0) */
 #define CHECK(c, s)	do { /**/ } while (0)
 /*
 * memline.c: Contains the functions for appending, deleting and changing the
 * text lines. The memfile functions are used to store the information in
 */
 if ((hp = mf_new(mfp, FALSE, 1)) == NULL)
 	goto error;
 if (hp->bh_bnum != 0)
 {
-	IEMSG(_("E298: Didn't get block nr 0?"));
+	iemsg(_("E298: Didn't get block nr 0?"));
 	goto error;
 }
 b0p = (ZERO_BL *)(hp->bh_data);
 b0p->b0_id[0] = BLOCK0_ID0;
 */
 if ((hp = ml_new_ptr(mfp)) == NULL)
 	goto error;
 if (hp->bh_bnum != 1)
 {
-	IEMSG(_("E298: Didn't get block nr 1?"));
+	iemsg(_("E298: Didn't get block nr 1?"));
 	goto error;
 }
 pp = (PTR_BL *)(hp->bh_data);
 pp->pb_count = 1;
 pp->pb_pointer[0].pe_bnum = 2;
 */
 if ((hp = ml_new_data(mfp, FALSE, 1)) == NULL)
 	goto error;
 if (hp->bh_bnum != 2)
 {
-	IEMSG(_("E298: Didn't get block nr 2?"));
+	iemsg(_("E298: Didn't get block nr 2?"));
 	goto error;
 }
 dp = (DATA_BL *)(hp->bh_data);
 dp->db_index[0] = --dp->db_txt_start;	/* at end of block */
 	}
 	if (hp != NULL)
 	    mf_put(mfp, hp, FALSE, FALSE);  /* release previous block */
 	if (error > 0)
-	    EMSG(_("E843: Error while updating swap file crypt"));
+	    emsg(_("E843: Error while updating swap file crypt"));
 }
 mfp->mf_old_key = NULL;
 }
 #endif
 {
 	mfp->mf_fd = mch_open((char *)mfp->mf_fname, O_RDWR | O_EXTRA, 0);
 	if (mfp->mf_fd < 0)
 	{
 	    /* could not (re)open the swap file, what can we do???? */
-	    EMSG(_("E301: Oops, lost the swap file!!!"));
+	    emsg(_("E301: Oops, lost the swap file!!!"));
 	    return;
 	}
 #ifdef HAVE_FD_CLOEXEC
 	{
 	    int fdflags = fcntl(mfp->mf_fd, F_GETFD);
 		(void)fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
 	}
 #endif
 }
 if (!success)
-	EMSG(_("E302: Could not rename swap file"));
+	emsg(_("E302: Could not rename swap file"));
 }
 /*
 * Open a file for the memfile for all buffers that are not readonly or have
 * been modified.
 if (mfp->mf_fname == NULL)		/* Failed! */
 {
 	need_wait_return = TRUE;	/* call wait_return later */
 	++no_wait_return;
-	(void)EMSG2(_("E303: Unable to open swap file for \"%s\", recovery impossible"),
+	(void)semsg(_("E303: Unable to open swap file for \"%s\", recovery impossible"),
 		    buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname);
 	--no_wait_return;
 }
 /* don't try to open a swap file again */
 	return;
 }
 b0p = (ZERO_BL *)(hp->bh_data);
 if (ml_check_b0_id(b0p) == FAIL)
-	IEMSG(_("E304: ml_upd_block0(): Didn't get block 0??"));
+	iemsg(_("E304: ml_upd_block0(): Didn't get block 0??"));
 else
 {
 	if (what == UB_FNAME)
 	    set_b0_fname(b0p, buf);
 #ifdef FEAT_CRYPT
 	/* count the number of matching swap files */
 	len = recover_names(fname, FALSE, 0, NULL);
 	if (len == 0)		    /* no swap files found */
 	{
-	    EMSG2(_("E305: No swap file found for %s"), fname);
+	    semsg(_("E305: No swap file found for %s"), fname);
 	    goto theend;
 	}
 	if (len == 1)		    /* one swap file found, use it */
 	    i = 1;
 	else			    /* several swap files found, choose */
 mfp = mf_open(fname_used, O_RDONLY);
 fname_used = p;
 if (mfp == NULL || mfp->mf_fd < 0)
 {
 	if (fname_used != NULL)
-	    EMSG2(_("E306: Cannot open %s"), fname_used);
+	    semsg(_("E306: Cannot open %s"), fname_used);
 	goto theend;
 }
 buf->b_ml.ml_mfp = mfp;
 #ifdef FEAT_CRYPT
 mfp->mf_buffer = buf;
 	msg_end();
 	goto theend;
 }
 if (ml_check_b0_id(b0p) == FAIL)
 {
-	EMSG2(_("E307: %s does not look like a Vim swap file"), mfp->mf_fname);
+	semsg(_("E307: %s does not look like a Vim swap file"), mfp->mf_fname);
 	goto theend;
 }
 if (b0_magic_wrong(b0p))
 {
 	msg_start();
 	mch_memmove(mfp->mf_seed, &b0p->b0_seed, MF_SEED_LEN);
 crypt_set_cm_option(buf, b0_cm < 0 ? 0 : b0_cm);
 #else
 if (b0p->b0_id[1] != BLOCK0_ID1)
 {
-	EMSG2(_("E833: %s is encrypted and this version of Vim does not support encryption"), mfp->mf_fname);
+	semsg(_("E833: %s is encrypted and this version of Vim does not support encryption"), mfp->mf_fname);
 	goto theend;
 }
 #endif
 /*
 	if (setfname(curbuf, NameBuff, NULL, TRUE) == FAIL)
 	    goto theend;
 }
 home_replace(NULL, mfp->mf_fname, NameBuff, MAXPATHL, TRUE);
-smsg((char_u *)_("Using swap file \"%s\""), NameBuff);
+smsg(_("Using swap file \"%s\""), NameBuff);
 if (buf_spname(curbuf) != NULL)
 	vim_strncpy(NameBuff, buf_spname(curbuf), MAXPATHL - 1);
 else
 	home_replace(NULL, curbuf->b_ffname, NameBuff, MAXPATHL, TRUE);
-smsg((char_u *)_("Original file \"%s\""), NameBuff);
+smsg(_("Original file \"%s\""), NameBuff);
 msg_putchar('\n');
 /*
 * check date of swap file and original file
 */
 	    && mch_stat((char *)curbuf->b_ffname, &org_stat) != -1
 	    && ((mch_stat((char *)mfp->mf_fname, &swp_stat) != -1
 		    && org_stat.st_mtime > swp_stat.st_mtime)
 		|| org_stat.st_mtime != mtime))
 {
-	EMSG(_("E308: Warning: Original file may have been changed"));
+	emsg(_("E308: Warning: Original file may have been changed"));
 }
 out_flush();
 /* Get the 'fileformat' and 'fileencoding' from block zero. */
 b0_ff = (b0p->b0_flags & B0_FF_MASK);
 {
 	/* Need to ask the user for the crypt key.  If this fails we continue
 	 * without a key, will probably get garbage text. */
 	if (*curbuf->b_p_key != NUL)
 	{
-	    smsg((char_u *)_("Swap file is encrypted: \"%s\""), fname_used);
+	    smsg(_("Swap file is encrypted: \"%s\""), fname_used);
 	    MSG_PUTS(_("\nIf you entered a new crypt key but did not write the text file,"));
 	    MSG_PUTS(_("\nenter the new crypt key."));
 	    MSG_PUTS(_("\nIf you wrote the text file after changing the crypt key press enter"));
 	    MSG_PUTS(_("\nto use the same key for text file and swap file"));
 	}
 	else
-	    smsg((char_u *)_(need_key_msg), fname_used);
+	    smsg(_(need_key_msg), fname_used);
 	buf->b_p_key = crypt_get_key(FALSE, FALSE);
 	if (buf->b_p_key == NULL)
 	    buf->b_p_key = curbuf->b_p_key;
 	else if (*buf->b_p_key == NUL)
 	{
 	 */
 	if ((hp = mf_get(mfp, (blocknr_T)bnum, page_count)) == NULL)
 	{
 	    if (bnum == 1)
 	    {
-		EMSG2(_("E309: Unable to read block 1 from %s"), mfp->mf_fname);
+		semsg(_("E309: Unable to read block 1 from %s"), mfp->mf_fname);
 		goto theend;
 	    }
 	    ++error;
 	    ml_append(lnum++, (char_u *)_("???MANY LINES MISSING"),
 							    (colnr_T)0, TRUE);
 		dp = (DATA_BL *)(hp->bh_data);
 		if (dp->db_id != DATA_ID)	/* block id wrong */
 		{
 		    if (bnum == 1)
 		    {
-			EMSG2(_("E310: Block 1 ID wrong (%s not a .swp file?)"),
+			semsg(_("E310: Block 1 ID wrong (%s not a .swp file?)"),
 							       mfp->mf_fname);
 			goto theend;
 		    }
 		    ++error;
 		    ml_append(lnum++, (char_u *)_("???BLOCK MISSING"),
 	ml_delete(curbuf->b_ml.ml_line_count, FALSE);
 curbuf->b_flags |= BF_RECOVERED;
 recoverymode = FALSE;
 if (got_int)
-	EMSG(_("E311: Recovery Interrupted"));
+	emsg(_("E311: Recovery Interrupted"));
 else if (error)
 {
 	++no_wait_return;
 	MSG(">>>>>>>>>>>>>");
-	EMSG(_("E312: Errors detected while recovering; look for lines starting with ???"));
+	emsg(_("E312: Errors detected while recovering; look for lines starting with ???"));
 	--no_wait_return;
 	MSG(_("See \":help E312\" for more information."));
 	MSG(">>>>>>>>>>>>>");
 }
 else
 int		got_int_save = got_int;
 if (mfp == NULL || mfp->mf_fname == NULL)
 {
 	if (message)
-	    EMSG(_("E313: Cannot preserve, there is no swap file"));
+	    emsg(_("E313: Cannot preserve, there is no swap file"));
 	return;
 }
 /* We only want to stop when interrupted here, not when interrupted
 * before. */
 if (message)
 {
 	if (status == OK)
 	    MSG(_("File preserved"));
 	else
-	    EMSG(_("E314: Preserve failed"));
+	    emsg(_("E314: Preserve failed"));
 }
 }
 /*
 * NOTE: The pointer returned by the ml_get_*() functions only remains valid
 	if (recursive == 0)
 	{
 	    /* Avoid giving this message for a recursive call, may happen when
 	     * the GUI redraws part of the text. */
 	    ++recursive;
-	    IEMSGN(_("E315: ml_get: invalid lnum: %ld"), lnum);
+	    siemsg(_("E315: ml_get: invalid lnum: %ld"), lnum);
 	    --recursive;
 	}
 errorret:
 	STRCPY(IObuff, "???");
 	return IObuff;
 	    if (recursive == 0)
 	    {
 		/* Avoid giving this message for a recursive call, may happen
 		 * when the GUI redraws part of the text. */
 		++recursive;
-		IEMSGN(_("E316: ml_get: cannot find line %ld"), lnum);
+		siemsg(_("E316: ml_get: cannot find line %ld"), lnum);
 		--recursive;
 	    }
 	    goto errorret;
 	}
 	    if ((hp = mf_get(mfp, ip->ip_bnum, 1)) == NULL)
 		goto theend;
 	    pp = (PTR_BL *)(hp->bh_data);   /* must be pointer block */
 	    if (pp->pb_id != PTR_ID)
 	    {
-		IEMSG(_("E317: pointer block id wrong 3"));
+		iemsg(_("E317: pointer block id wrong 3"));
 		mf_put(mfp, hp, FALSE, FALSE);
 		goto theend;
 	    }
 	    /*
 	     * TODO: If the pointer block is full and we are adding at the end
 	/*
 	 * Safety check: fallen out of for loop?
 	 */
 	if (stack_idx < 0)
 	{
-	    IEMSG(_("E318: Updated too many blocks?"));
+	    iemsg(_("E318: Updated too many blocks?"));
 	    buf->b_ml.ml_stack_top = 0;	/* invalidate stack */
 	}
 }
 #ifdef FEAT_BYTEOFF
 	    if ((hp = mf_get(mfp, ip->ip_bnum, 1)) == NULL)
 		goto theend;
 	    pp = (PTR_BL *)(hp->bh_data);   /* must be pointer block */
 	    if (pp->pb_id != PTR_ID)
 	    {
-		IEMSG(_("E317: pointer block id wrong 4"));
+		iemsg(_("E317: pointer block id wrong 4"));
 		mf_put(mfp, hp, FALSE, FALSE);
 		goto theend;
 	    }
 	    count = --(pp->pb_count);
 	    if (count == 0)	    /* the pointer block becomes empty! */
 	lnum = buf->b_ml.ml_line_lnum;
 	new_line = buf->b_ml.ml_line_ptr;
 	hp = ml_find_line(buf, lnum, ML_FIND);
 	if (hp == NULL)
-	    IEMSGN(_("E320: Cannot find line %ld"), lnum);
+	    siemsg(_("E320: Cannot find line %ld"), lnum);
 	else
 	{
 	    dp = (DATA_BL *)(hp->bh_data);
 	    idx = lnum - buf->b_ml.ml_locked_low;
 	    start = ((dp->db_index[idx]) & DB_INDEX_MASK);
 	}
 	pp = (PTR_BL *)(dp);		/* must be pointer block */
 	if (pp->pb_id != PTR_ID)
 	{
-	    IEMSG(_("E317: pointer block id wrong"));
+	    iemsg(_("E317: pointer block id wrong"));
 	    goto error_block;
 	}
 	if ((top = ml_add_stack(buf)) < 0)	/* add new entry to stack */
 	    goto error_block;
 	    }
 	}
 	if (idx >= (int)pp->pb_count)	    /* past the end: something wrong! */
 	{
 	    if (lnum > buf->b_ml.ml_line_count)
-		IEMSGN(_("E322: line number out of range: %ld past the end"),
+		siemsg(_("E322: line number out of range: %ld past the end"),
 					      lnum - buf->b_ml.ml_line_count);
 	    else
-		IEMSGN(_("E323: line count wrong in block %ld"), bnum);
+		siemsg(_("E323: line count wrong in block %ld"), bnum);
 	    goto error_block;
 	}
 	if (action == ML_DELETE)
 	{
 	    pp->pb_pointer[idx].pe_line_count--;
 	    break;
 	pp = (PTR_BL *)(hp->bh_data);	/* must be pointer block */
 	if (pp->pb_id != PTR_ID)
 	{
 	    mf_put(mfp, hp, FALSE, FALSE);
-	    IEMSG(_("E317: pointer block id wrong 2"));
+	    iemsg(_("E317: pointer block id wrong 2"));
 	    break;
 	}
 	pp->pb_pointer[ip->ip_index].pe_line_count += count;
 	ip->ip_high += count;
 	mf_put(mfp, hp, TRUE, FALSE);
 for (;;)
 {
 	/* Limit symlink depth to 100, catch recursive loops. */
 	if (++depth == 100)
 	{
-	    EMSG2(_("E773: Symlink loop for \"%s\""), fname);
+	    semsg(_("E773: Symlink loop for \"%s\""), fname);
 	    return FAIL;
 	}
 	ret = readlink((char *)tmp, (char *)buf, MAXPATHL - 1);
 	if (ret <= 0)
 stat_T	st;
 time_t	x, sx;
 char	*p;
 ++no_wait_return;
-(void)EMSG(_("E325: ATTENTION"));
+(void)emsg(_("E325: ATTENTION"));
 MSG_PUTS(_("\nFound a swap file by the name \""));
 msg_home_replace(fname);
 MSG_PUTS("\"\n");
 sx = swapfile_info(fname);
 MSG_PUTS(_("While opening file \""));
 	 */
 	if (fname[n - 1] == 'a')	/* ".s?a" */
 	{
 	    if (fname[n - 2] == 'a')    /* ".saa": tried enough, give up */
 	    {
-		EMSG(_("E326: Too many swap files found"));
+		emsg(_("E326: Too many swap files found"));
 		VIM_CLEAR(fname);
 		break;
 	    }
 	    --fname[n - 2];		/* ".svz", ".suz", etc. */
 	    fname[n - 1] = 'z' + 1;

Mercurial > vim

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