/****************************************************************************
- * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
#include <curses.priv.h>
-#include <term_entry.h>
#include <tic.h>
-MODULE_ID("$Id: lib_ti.c,v 1.26 2009/07/11 18:14:21 tom Exp $")
+MODULE_ID("$Id: lib_ti.c,v 1.29 2010/01/23 17:57:43 tom Exp $")
#if 0
static bool
int result = ABSENT_BOOLEAN;
int i, j;
- T((T_CALLED("tigetflag(%p, %s)"), SP_PARM, str));
+ T((T_CALLED("tigetflag(%p, %s)"), (void *) SP_PARM, str));
if (HasTInfoTerminal(SP_PARM)) {
TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
int i, j;
int result = CANCELLED_NUMERIC; /* Solaris returns a -1 on error */
- T((T_CALLED("tigetnum(%p, %s)"), SP_PARM, str));
+ T((T_CALLED("tigetnum(%p, %s)"), (void *) SP_PARM, str));
if (HasTInfoTerminal(SP_PARM)) {
TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
}
}
#endif
- if (j >= 0 && VALID_NUMERIC(tp->Numbers[j]))
- result = tp->Numbers[j];
- else
- result = ABSENT_NUMERIC;
+ if (j >= 0) {
+ if (VALID_NUMERIC(tp->Numbers[j]))
+ result = tp->Numbers[j];
+ else
+ result = ABSENT_NUMERIC;
+ }
}
returnCode(result);
char *result = CANCELLED_STRING;
int i, j;
- T((T_CALLED("tigetstr(%p, %s)"), SP_PARM, str));
+ T((T_CALLED("tigetstr(%p, %s)"), (void *) SP_PARM, str));
if (HasTInfoTerminal(SP_PARM)) {
TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);