To: [email protected]

Subject: Patch 7.2.055

Fcc: outbox

From: Bram Moolenaar <[email protected]>

Mime-Version: 1.0

Content-Type: text/plain; charset=ISO-8859-1

Content-Transfer-Encoding: 8bit

------------

Patch 7.2.055

Problem:    Various compiler warnings with strict checking.

Solution:   Avoid the warnings by using return values and renaming.

Files:	    src/diff.c, src/eval.c, src/ex_cmds.c, src/ex_docmd.c,

	    src/fileio.c, src/fold.c, src/globals.h, src/gui.c,

	    src/gui_at_sb.c, src/gui_gtk_x11.c, src/gui_xmdlg.c,

	    src/gui_xmebw.c, src/main.c, src/mbyte.c, src/message.c,

	    src/netbeans.c, src/option.c, src/os_unix.c, src/spell.c,

	    src/ui.c, src/window.c

*** ../vim-7.2.054/src/diff.c	Fri Jan 18 17:39:32 2008

--- src/diff.c	Fri Nov 28 17:23:35 2008

***************

*** 661,666 ****

--- 665,671 ----

      char_u	*tmp_diff;

      FILE	*fd;

      int		ok;

+     int		io_error = FALSE;

      /* Delete all diffblocks. */

      diff_clear(curtab);

***************

*** 697,714 ****

      {

  	ok = FALSE;

  	fd = mch_fopen((char *)tmp_orig, "w");

! 	if (fd != NULL)

  	{

! 	    fwrite("line1\n", (size_t)6, (size_t)1, fd);

  	    fclose(fd);

  	    fd = mch_fopen((char *)tmp_new, "w");

! 	    if (fd != NULL)

  	    {

! 		fwrite("line2\n", (size_t)6, (size_t)1, fd);

  		fclose(fd);

  		diff_file(tmp_orig, tmp_new, tmp_diff);

  		fd = mch_fopen((char *)tmp_diff, "r");

! 		if (fd != NULL)

  		{

  		    char_u	linebuf[LBUFLEN];

--- 702,727 ----

      {

  	ok = FALSE;

  	fd = mch_fopen((char *)tmp_orig, "w");

! 	if (fd == NULL)

! 	    io_error = TRUE;

! 	else

  	{

! 	    if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)

! 		io_error = TRUE;

  	    fclose(fd);

  	    fd = mch_fopen((char *)tmp_new, "w");

! 	    if (fd == NULL)

! 		io_error = TRUE;

! 	    else

  	    {

! 		if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)

! 		    io_error = TRUE;

  		fclose(fd);

  		diff_file(tmp_orig, tmp_new, tmp_diff);

  		fd = mch_fopen((char *)tmp_diff, "r");

! 		if (fd == NULL)

! 		    io_error = TRUE;

! 		else

  		{

  		    char_u	linebuf[LBUFLEN];

***************

*** 761,766 ****

--- 774,781 ----

      }

      if (!ok)

      {

+ 	if (io_error)

+ 	    EMSG(_("E810: Cannot read or write temp files"));

  	EMSG(_("E97: Cannot create diffs"));

  	diff_a_works = MAYBE;

  #if defined(MSWIN) || defined(MSDOS)

***************

*** 925,934 ****

      {

  # ifdef TEMPDIRNAMES

  	if (vim_tempdir != NULL)

! 	    mch_chdir((char *)vim_tempdir);

  	else

  # endif

! 	    mch_chdir("/tmp");

  	shorten_fnames(TRUE);

      }

  #endif

--- 940,949 ----

      {

  # ifdef TEMPDIRNAMES

  	if (vim_tempdir != NULL)

! 	    ignored = mch_chdir((char *)vim_tempdir);

  	else

  # endif

! 	    ignored = mch_chdir("/tmp");

  	shorten_fnames(TRUE);

      }

  #endif

*** ../vim-7.2.054/src/eval.c	Fri Nov 28 11:15:10 2008

--- src/eval.c	Fri Nov 28 12:23:13 2008

***************

*** 10641,10647 ****

  # ifdef FEAT_WINDOWS

  	    win_T	*wp;

  # endif

! 	    int		n = 1;

  	    if (row >= 0 && col >= 0)

  	    {

--- 10641,10647 ----

  # ifdef FEAT_WINDOWS

  	    win_T	*wp;

  # endif

! 	    int		winnr = 1;

  	    if (row >= 0 && col >= 0)

  	    {

***************

*** 10651,10659 ****

  		(void)mouse_comp_pos(win, &row, &col, &lnum);

  # ifdef FEAT_WINDOWS

  		for (wp = firstwin; wp != win; wp = wp->w_next)

! 		    ++n;

  # endif

! 		vimvars[VV_MOUSE_WIN].vv_nr = n;

  		vimvars[VV_MOUSE_LNUM].vv_nr = lnum;

  		vimvars[VV_MOUSE_COL].vv_nr = col + 1;

  	    }

--- 10651,10659 ----

  		(void)mouse_comp_pos(win, &row, &col, &lnum);

  # ifdef FEAT_WINDOWS

  		for (wp = firstwin; wp != win; wp = wp->w_next)

! 		    ++winnr;

  # endif

! 		vimvars[VV_MOUSE_WIN].vv_nr = winnr;

  		vimvars[VV_MOUSE_LNUM].vv_nr = lnum;

  		vimvars[VV_MOUSE_COL].vv_nr = col + 1;

  	    }

*** ../vim-7.2.054/src/ex_cmds.c	Sat Nov 15 14:10:23 2008

--- src/ex_cmds.c	Fri Nov 28 17:24:08 2008

***************

*** 1941,1947 ****

  	     * root.

  	     */

  	    if (fp_out != NULL)

! 		(void)fchown(fileno(fp_out), st_old.st_uid, st_old.st_gid);

  #endif

  	}

      }

--- 1941,1947 ----

  	     * root.

  	     */

  	    if (fp_out != NULL)

! 		ignored = fchown(fileno(fp_out), st_old.st_uid, st_old.st_gid);

  #endif

  	}

      }

*** ../vim-7.2.054/src/ex_docmd.c	Sat Nov 15 14:10:23 2008

--- src/ex_docmd.c	Fri Nov 28 17:26:13 2008

***************

*** 8753,8760 ****

  		else if (*dirnow != NUL

  			&& (ssop_flags & SSOP_CURDIR) && globaldir != NULL)

  		{

! 		    (void)mch_chdir((char *)globaldir);

! 		    shorten_fnames(TRUE);

  		}

  		failed |= (makeopens(fd, dirnow) == FAIL);

--- 8753,8760 ----

  		else if (*dirnow != NUL

  			&& (ssop_flags & SSOP_CURDIR) && globaldir != NULL)

  		{

! 		    if (mch_chdir((char *)globaldir) == OK)

! 			shorten_fnames(TRUE);

  		}

  		failed |= (makeopens(fd, dirnow) == FAIL);

*** ../vim-7.2.054/src/fileio.c	Wed Nov 12 16:04:43 2008

--- src/fileio.c	Fri Nov 28 17:35:54 2008

***************

*** 2214,2220 ****

      {

  	/* Use stderr for stdin, makes shell commands work. */

  	close(0);

! 	dup(2);

      }

  #endif

--- 2214,2220 ----

      {

  	/* Use stderr for stdin, makes shell commands work. */

  	close(0);

! 	ignored = dup(2);

      }

  #endif

***************

*** 3449,3455 ****

  		{

  # ifdef UNIX

  #  ifdef HAVE_FCHOWN

! 		    fchown(fd, st_old.st_uid, st_old.st_gid);

  #  endif

  		    if (mch_stat((char *)IObuff, &st) < 0

  			    || st.st_uid != st_old.st_uid

--- 3449,3455 ----

  		{

  # ifdef UNIX

  #  ifdef HAVE_FCHOWN

! 		    ignored = fchown(fd, st_old.st_uid, st_old.st_gid);

  #  endif

  		    if (mch_stat((char *)IObuff, &st) < 0

  			    || st.st_uid != st_old.st_uid

***************

*** 4365,4371 ****

  		|| st.st_uid != st_old.st_uid

  		|| st.st_gid != st_old.st_gid)

  	{

! 	    fchown(fd, st_old.st_uid, st_old.st_gid);

  	    if (perm >= 0)	/* set permission again, may have changed */

  		(void)mch_setperm(wfname, perm);

  	}

--- 4365,4371 ----

  		|| st.st_uid != st_old.st_uid

  		|| st.st_gid != st_old.st_gid)

  	{

! 	    ignored = fchown(fd, st_old.st_uid, st_old.st_gid);

  	    if (perm >= 0)	/* set permission again, may have changed */

  		(void)mch_setperm(wfname, perm);

  	}

***************

*** 6030,6038 ****

  	{

  	    tbuf[FGETS_SIZE - 2] = NUL;

  #ifdef USE_CR

! 	    fgets_cr((char *)tbuf, FGETS_SIZE, fp);

  #else

! 	    fgets((char *)tbuf, FGETS_SIZE, fp);

  #endif

  	} while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n');

      }

--- 6030,6038 ----

  	{

  	    tbuf[FGETS_SIZE - 2] = NUL;

  #ifdef USE_CR

! 	    ignoredp = fgets_cr((char *)tbuf, FGETS_SIZE, fp);

  #else

! 	    ignoredp = fgets((char *)tbuf, FGETS_SIZE, fp);

  #endif

  	} while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n');

      }

*** ../vim-7.2.054/src/fold.c	Wed Aug  6 18:59:40 2008

--- src/fold.c	Fri Nov 28 12:24:16 2008

***************

*** 48,54 ****

  static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));

  static int foldLevelWin __ARGS((win_T *wp, linenr_T lnum));

  static void checkupdate __ARGS((win_T *wp));

! static void setFoldRepeat __ARGS((linenr_T lnum, long count, int open));

  static linenr_T setManualFold __ARGS((linenr_T lnum, int opening, int recurse, int *donep));

  static linenr_T setManualFoldWin __ARGS((win_T *wp, linenr_T lnum, int opening, int recurse, int *donep));

  static void foldOpenNested __ARGS((fold_T *fpr));

--- 48,54 ----

  static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));

  static int foldLevelWin __ARGS((win_T *wp, linenr_T lnum));

  static void checkupdate __ARGS((win_T *wp));

! static void setFoldRepeat __ARGS((linenr_T lnum, long count, int do_open));

  static linenr_T setManualFold __ARGS((linenr_T lnum, int opening, int recurse, int *donep));

  static linenr_T setManualFoldWin __ARGS((win_T *wp, linenr_T lnum, int opening, int recurse, int *donep));

  static void foldOpenNested __ARGS((fold_T *fpr));

***************

*** 1241,1250 ****

   * Repeat "count" times.

   */

      static void

! setFoldRepeat(lnum, count, open)

      linenr_T	lnum;

      long	count;

!     int		open;

  {

      int		done;

      long	n;

--- 1241,1250 ----

   * Repeat "count" times.

   */

      static void

! setFoldRepeat(lnum, count, do_open)

      linenr_T	lnum;

      long	count;

!     int		do_open;

  {

      int		done;

      long	n;

***************

*** 1252,1258 ****

      for (n = 0; n < count; ++n)

      {

  	done = DONE_NOTHING;

! 	(void)setManualFold(lnum, open, FALSE, &done);

  	if (!(done & DONE_ACTION))

  	{

  	    /* Only give an error message when no fold could be opened. */

--- 1252,1258 ----

      for (n = 0; n < count; ++n)

      {

  	done = DONE_NOTHING;

! 	(void)setManualFold(lnum, do_open, FALSE, &done);

  	if (!(done & DONE_ACTION))

  	{

  	    /* Only give an error message when no fold could be opened. */

*** ../vim-7.2.054/src/globals.h	Thu Sep 18 21:29:07 2008

--- src/globals.h	Fri Nov 28 17:35:50 2008

***************

*** 1549,1554 ****

--- 1549,1562 ----

  EXTERN time_t starttime;

  /*

+  * Some compilers warn for not using a return value, but in some situations we

+  * can't do anything useful with the value.  Assign to this variable to avoid

+  * the warning.

+  */

+ EXTERN int ignored;

+ EXTERN char *ignoredp;

+ 

+ /*

   * Optional Farsi support.  Include it here, so EXTERN and INIT are defined.

   */

  #ifdef FEAT_FKMAP

*** ../vim-7.2.054/src/gui.c	Wed Aug  6 14:37:26 2008

--- src/gui.c	Fri Nov 28 18:48:31 2008

***************

*** 139,145 ****

  		/* The read returns when the child closes the pipe (or when

  		 * the child dies for some reason). */

  		close(pipefd[1]);

! 		(void)read(pipefd[0], &dummy, (size_t)1);

  		close(pipefd[0]);

  	    }

--- 139,145 ----

  		/* The read returns when the child closes the pipe (or when

  		 * the child dies for some reason). */

  		close(pipefd[1]);

! 		ignored = (int)read(pipefd[0], &dummy, (size_t)1);

  		close(pipefd[0]);

  	    }

*** ../vim-7.2.054/src/gui_at_sb.c	Sun Jun 13 21:37:13 2004

--- src/gui_at_sb.c	Fri Nov 28 12:19:19 2008

***************

*** 1078,1083 ****

--- 1078,1089 ----

      Cardinal	*num_params;	/* unused */

  {

      ScrollbarWidget sbw = (ScrollbarWidget)w;

+     /* Use a union to avoid a warning for the weird conversion from float to

+      * XtPointer.  Comes from Xaw/Scrollbar.c. */

+     union {

+ 	XtPointer xtp;

+ 	float xtf;

+     } xtpf;

      if (LookAhead(w, event))

  	return;

***************

*** 1085,1091 ****

      /* thumbProc is not pretty, but is necessary for backwards

         compatibility on those architectures for which it work{s,ed};

         the intent is to pass a (truncated) float by value. */

!     XtCallCallbacks(w, XtNthumbProc, *(XtPointer*)&sbw->scrollbar.top);

      XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);

  }

--- 1091,1098 ----

      /* thumbProc is not pretty, but is necessary for backwards

         compatibility on those architectures for which it work{s,ed};

         the intent is to pass a (truncated) float by value. */

!     xtpf.xtf = sbw->scrollbar.top;

!     XtCallCallbacks(w, XtNthumbProc, xtpf.xtp);

      XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);

  }

*** ../vim-7.2.054/src/gui_gtk_x11.c	Tue Jul  8 12:46:08 2008

--- src/gui_gtk_x11.c	Fri Nov 28 21:06:38 2008

***************

*** 4070,4083 ****

  	if (mask & (XValue | YValue))

  	{

! 	    int w, h;

! 	    gui_mch_get_screen_dimensions(&w, &h);

! 	    h += p_ghr + get_menu_tool_height();

! 	    w += get_menu_tool_width();

  	    if (mask & XNegative)

! 		x += w - pixel_width;

  	    if (mask & YNegative)

! 		y += h - pixel_height;

  #ifdef HAVE_GTK2

  	    gtk_window_move(GTK_WINDOW(gui.mainwin), x, y);

  #else

--- 4070,4083 ----

  	if (mask & (XValue | YValue))

  	{

! 	    int ww, hh;

! 	    gui_mch_get_screen_dimensions(&ww, &hh);

! 	    hh += p_ghr + get_menu_tool_height();

! 	    ww += get_menu_tool_width();

  	    if (mask & XNegative)

! 		x += ww - pixel_width;

  	    if (mask & YNegative)

! 		y += hh - pixel_height;

  #ifdef HAVE_GTK2

  	    gtk_window_move(GTK_WINDOW(gui.mainwin), x, y);

  #else

*** ../vim-7.2.054/src/gui_xmdlg.c	Tue Jun 24 23:39:32 2008

--- src/gui_xmdlg.c	Fri Nov 28 21:04:08 2008

***************

*** 369,378 ****

      char	buf[TEMP_BUF_SIZE];

      XmString	items[MAX_ENTRIES_IN_LIST];

      int		i;

!     int		index;

!     for (index = (int)ENCODING; index < (int)NONE; ++index)

! 	count[index] = 0;

      /* First we insert the wild char into every single list. */

      if (fix != ENCODING)

--- 369,378 ----

      char	buf[TEMP_BUF_SIZE];

      XmString	items[MAX_ENTRIES_IN_LIST];

      int		i;

!     int		idx;

!     for (idx = (int)ENCODING; idx < (int)NONE; ++idx)

! 	count[idx] = 0;

      /* First we insert the wild char into every single list. */

      if (fix != ENCODING)

***************

*** 503,516 ****

      /*

       * Now loop trough the remaining lists and set them up.

       */

!     for (index = (int)NAME; index < (int)NONE; ++index)

      {

  	Widget w;

! 	if (fix == (enum ListSpecifier)index)

  	    continue;

! 	switch ((enum ListSpecifier)index)

  	{

  	    case NAME:

  		w = data->list[NAME];

--- 503,516 ----

      /*

       * Now loop trough the remaining lists and set them up.

       */

!     for (idx = (int)NAME; idx < (int)NONE; ++idx)

      {

  	Widget w;

! 	if (fix == (enum ListSpecifier)idx)

  	    continue;

! 	switch ((enum ListSpecifier)idx)

  	{

  	    case NAME:

  		w = data->list[NAME];

***************

*** 525,545 ****

  		w = (Widget)0;	/* for lint */

  	}

! 	for (i = 0; i < count[index]; ++i)

  	{

! 	    items[i] = XmStringCreateLocalized(list[index][i]);

! 	    XtFree(list[index][i]);

  	}

  	XmListDeleteAllItems(w);

! 	XmListAddItems(w, items, count[index], 1);

! 	if (data->sel[index])

  	{

  	    XmStringFree(items[0]);

! 	    items[0] = XmStringCreateLocalized(data->sel[index]);

  	    XmListSelectItem(w, items[0], False);

  	    XmListSetBottomItem(w, items[0]);

  	}

! 	for (i = 0; i < count[index]; ++i)

  	    XmStringFree(items[i]);

      }

  }

--- 525,545 ----

  		w = (Widget)0;	/* for lint */

  	}

! 	for (i = 0; i < count[idx]; ++i)

  	{

! 	    items[i] = XmStringCreateLocalized(list[idx][i]);

! 	    XtFree(list[idx][i]);

  	}

  	XmListDeleteAllItems(w);

! 	XmListAddItems(w, items, count[idx], 1);

! 	if (data->sel[idx])

  	{

  	    XmStringFree(items[0]);

! 	    items[0] = XmStringCreateLocalized(data->sel[idx]);

  	    XmListSelectItem(w, items[0], False);

  	    XmListSetBottomItem(w, items[0]);

  	}