Remove the latest set of warnings (catched by gcc 4). Now everything
should be clean. This commit was SVN r11341.
Этот коммит содержится в:
родитель
5e280cda19
Коммит
a5d20ec565
@ -227,7 +227,7 @@ opal_event_init(void)
|
|||||||
|
|
||||||
#if OPAL_HAVE_WORKING_EVENTOPS
|
#if OPAL_HAVE_WORKING_EVENTOPS
|
||||||
|
|
||||||
if ((current_base = (event_base*)calloc(1, sizeof(struct event_base))) == NULL)
|
if ((current_base = (struct event_base*)calloc(1, sizeof(struct event_base))) == NULL)
|
||||||
event_err(1, "%s: calloc");
|
event_err(1, "%s: calloc");
|
||||||
|
|
||||||
event_sigcb = NULL;
|
event_sigcb = NULL;
|
||||||
|
@ -324,11 +324,11 @@ main(int argc, char *argv[])
|
|||||||
#if defined(EXEEXT)
|
#if defined(EXEEXT)
|
||||||
if( 0 != strlen(EXEEXT) ) {
|
if( 0 != strlen(EXEEXT) ) {
|
||||||
char extension[] = EXEEXT;
|
char extension[] = EXEEXT;
|
||||||
char* temp = strstr( base_argv0, EXEEXT );
|
char* temp = strstr( base_argv0, extension );
|
||||||
char* old_match = temp;
|
char* old_match = temp;
|
||||||
while( NULL != temp ) {
|
while( NULL != temp ) {
|
||||||
old_match = temp;
|
old_match = temp;
|
||||||
temp = strstr( temp + 1, EXEEXT );
|
temp = strstr( temp + 1, extension );
|
||||||
}
|
}
|
||||||
*old_match = '\0';
|
*old_match = '\0';
|
||||||
}
|
}
|
||||||
|
@ -555,7 +555,7 @@ char *opal_cmd_line_get_usage_msg(opal_cmd_line_t *cmd)
|
|||||||
}
|
}
|
||||||
strcat(line, " ");
|
strcat(line, " ");
|
||||||
for (i = 0; (int)i < option->clo_num_params; ++i) {
|
for (i = 0; (int)i < option->clo_num_params; ++i) {
|
||||||
snprintf(temp, len, "<arg%d> ", i);
|
snprintf(temp, len, "<arg%d> ", (int)i);
|
||||||
strcat(line, temp);
|
strcat(line, temp);
|
||||||
}
|
}
|
||||||
if (option->clo_num_params > 0) {
|
if (option->clo_num_params > 0) {
|
||||||
|
@ -30,7 +30,13 @@
|
|||||||
* local functions
|
* local functions
|
||||||
*/
|
*/
|
||||||
static int finish_parsing(void);
|
static int finish_parsing(void);
|
||||||
extern "C" int opal_util_keyval_yywrap(void);
|
#if defined(c_plusplus) || defined(__cplusplus)
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
int opal_util_keyval_yywrap(void);
|
||||||
|
#if defined(c_plusplus) || defined(__cplusplus)
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* global variables
|
* global variables
|
||||||
@ -94,7 +100,7 @@ static int finish_parsing(void)
|
|||||||
return YY_NULL;
|
return YY_NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int opal_util_keyval_yywrap(void)
|
int opal_util_keyval_yywrap(void)
|
||||||
{
|
{
|
||||||
opal_util_keyval_parse_done = true;
|
opal_util_keyval_parse_done = true;
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -91,7 +91,7 @@ static int guess_strlen(const char *fmt, va_list ap)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 'f':
|
case 'f':
|
||||||
farg = va_arg(ap, float);
|
farg = va_arg(ap, int);
|
||||||
/* Alloc for minus sign */
|
/* Alloc for minus sign */
|
||||||
if (farg < 0) {
|
if (farg < 0) {
|
||||||
++len;
|
++len;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user