eliminate compiler warnings (VB)
This commit is contained in:
+3
-2
@@ -27,6 +27,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include <assert.h>
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
@@ -252,6 +253,8 @@ void menu_build_screen (MenuItem *menu, Screen *s)
|
|||||||
(w->text)[display_props->width-1] = '\0';
|
(w->text)[display_props->width-1] = '\0';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
assert(!"unexpected menuitem type");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -447,8 +450,6 @@ MenuResult menu_process_input (Menu *menu, MenuToken token, char * key, bool ext
|
|||||||
case MENUITEM_NUMERIC:
|
case MENUITEM_NUMERIC:
|
||||||
case MENUITEM_ALPHA:
|
case MENUITEM_ALPHA:
|
||||||
case MENUITEM_IP:
|
case MENUITEM_IP:
|
||||||
//if (subitem->event_func)
|
|
||||||
// subitem->event_func (subitem, MENUEVENT_ENTER);
|
|
||||||
return MENURESULT_ENTER;
|
return MENURESULT_ENTER;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|||||||
+2
-7
@@ -39,17 +39,12 @@ typedef MenuItem Menu;
|
|||||||
|
|
||||||
Menu *menu_create (char *id, MenuEventFunc(*event_func),
|
Menu *menu_create (char *id, MenuEventFunc(*event_func),
|
||||||
char *text, void *association);
|
char *text, void *association);
|
||||||
/* Creates a new menu.
|
/* Creates a new menu. */
|
||||||
*/
|
|
||||||
/* Creates a string value box.
|
|
||||||
* Association is free to set to anything you want. It's not used by the menu.
|
|
||||||
* Generated events: MENUEVENT_ENTER upon entering this menu,
|
|
||||||
*/
|
|
||||||
|
|
||||||
void menu_destroy (Menu *menu);
|
void menu_destroy (Menu *menu);
|
||||||
/* Deletes menu from memory.
|
/* Deletes menu from memory.
|
||||||
* Destructors will be called for all subitems.
|
* Destructors will be called for all subitems.
|
||||||
* DO NOT CALL THIS FUNCTION, CALL menuitem_destoy INSTEAD !
|
* DO NOT CALL THIS FUNCTION, CALL menuitem_destroy INSTEAD !
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void menu_add_item (Menu *menu, MenuItem *item);
|
void menu_add_item (Menu *menu, MenuItem *item);
|
||||||
|
|||||||
+1
-1
@@ -174,7 +174,7 @@ render_frame (LinkedList * list,
|
|||||||
int vis_width = right - left; /* width of visible frame area */
|
int vis_width = right - left; /* width of visible frame area */
|
||||||
int vis_height = bottom - top; /* height of visible frame area */
|
int vis_height = bottom - top; /* height of visible frame area */
|
||||||
int x, y;
|
int x, y;
|
||||||
int fx = 0, fy = 0; /* Scrolling offset for the frame... */
|
int /*fx = 0,*/ fy = 0; /* Scrolling offset for the frame... */
|
||||||
int length, speed;
|
int length, speed;
|
||||||
int str_length = BUFSIZE-1;
|
int str_length = BUFSIZE-1;
|
||||||
int reset = 1;
|
int reset = 1;
|
||||||
|
|||||||
+2
-1
@@ -176,7 +176,8 @@ sock_shutdown ()
|
|||||||
{
|
{
|
||||||
if (clientIt->client)
|
if (clientIt->client)
|
||||||
{
|
{
|
||||||
/* destroying a client also closes its socket */
|
*/
|
||||||
|
/* destroying a client also closes its socket */
|
||||||
/* client_destroy(clientIt->client);
|
/* client_destroy(clientIt->client);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -268,7 +268,6 @@ sock_recv (int fd, void *dest, size_t maxlen)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
static char retString[256];
|
|
||||||
|
|
||||||
char*
|
char*
|
||||||
sock_geterror(void)
|
sock_geterror(void)
|
||||||
@@ -276,6 +275,7 @@ sock_geterror(void)
|
|||||||
#ifndef WINSOCK2
|
#ifndef WINSOCK2
|
||||||
return strerror(errno);
|
return strerror(errno);
|
||||||
#else
|
#else
|
||||||
|
static char retString[256];
|
||||||
long err;
|
long err;
|
||||||
char* tmp;
|
char* tmp;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user