adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.1.1983: compiler nags for uninitialized variable and unused function

Browse Source 
Problem:    Compiler nags for uninitialized variable and unused function.
Solution:   Add unnecessary initialization.  Move function inside #ifdef.
This commit is contained in:
Bram Moolenaar
2019-09-04 18:53:12 +02:00
parent 6a124e622c
commit ea781459b9
3 changed files with 36 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/channel.c
View File

@ -55,9 +55,6 @@
#endif
static void channel_read(channel_T *channel, ch_part_T part, char *func);
# if defined(MSWIN) || defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK)
static channel_T *channel_fd2channel(sock_T fd, ch_part_T *partp);
# endif
static ch_mode_T channel_get_mode(channel_T *channel, ch_part_T part);
static int channel_get_timeout(channel_T *channel, ch_part_T part);
static ch_part_T channel_part_send(channel_T *channel);
@ -505,7 +502,31 @@ free_unused_channels(int copyID, int mask)
#if defined(FEAT_GUI) || defined(PROTO)
#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK)
# if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK)
/*
* Lookup the channel from the socket. Set "partp" to the fd index.
* Returns NULL when the socket isn't found.
*/
static channel_T *
channel_fd2channel(sock_T fd, ch_part_T *partp)
{
channel_T *channel;
ch_part_T part;
if (fd != INVALID_FD)
for (channel = first_channel; channel != NULL;
channel = channel->ch_next)
{
for (part = PART_SOCK; part < PART_IN; ++part)
if (channel->ch_part[part].ch_fd == fd)
{
*partp = part;
return channel;
}
}
return NULL;
}
static void
channel_read_fd(int fd)
{
@ -518,12 +539,12 @@ channel_read_fd(int fd)
else
channel_read(channel, part, "channel_read_fd");
}
#endif
# endif
/*
* Read a command from netbeans.
*/
#ifdef FEAT_GUI_X11
# ifdef FEAT_GUI_X11
static void
messageFromServerX11(XtPointer clientData,
int *unused1 UNUSED,
@ -531,9 +552,9 @@ messageFromServerX11(XtPointer clientData,
{
channel_read_fd((int)(long)clientData);
}
#endif
# endif
#ifdef FEAT_GUI_GTK
# ifdef FEAT_GUI_GTK
# if GTK_CHECK_VERSION(3,0,0)
static gboolean
messageFromServerGtk3(GIOChannel *unused1 UNUSED,
@ -553,7 +574,7 @@ messageFromServerGtk2(gpointer clientData,
channel_read_fd((int)(long)clientData);
}
# endif
#endif
# endif
static void
channel_gui_register_one(channel_T *channel, ch_part_T part)
@ -674,7 +695,7 @@ channel_gui_unregister(channel_T *channel)
channel_gui_unregister_one(channel, part);
}
#endif
#endif // FEAT_GUI
static char *e_cannot_connect = N_("E902: Cannot connect to port");
@ -3764,33 +3785,6 @@ theend:
free_job_options(&opt);
}
# if defined(MSWIN) || defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) \
|| defined(PROTO)
/*
* Lookup the channel from the socket. Set "partp" to the fd index.
* Returns NULL when the socket isn't found.
*/
static channel_T *
channel_fd2channel(sock_T fd, ch_part_T *partp)
{
channel_T *channel;
ch_part_T part;
if (fd != INVALID_FD)
for (channel = first_channel; channel != NULL;
channel = channel->ch_next)
{
for (part = PART_SOCK; part < PART_IN; ++part)
if (channel->ch_part[part].ch_fd == fd)
{
*partp = part;
return channel;
}
}
return NULL;
}
# endif
# if defined(MSWIN) || defined(FEAT_GUI) || defined(PROTO)
/*
* Check the channels for anything that is ready to be read.

2
src/memline.c
View File

@ -2716,7 +2716,7 @@ add_text_props_for_append(
int count;
int n;
char_u *props;
int new_len;
int new_len = 0; // init for gcc
char_u *new_line;
textprop_T prop;

2
src/version.c
View File

@ -757,6 +757,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1983,
/**/
1982,
/**/