small warnings.

This commit is contained in:
Vitor Santos Costa
2014-11-25 16:42:35 +00:00
parent 50659967ed
commit 2be225c17a
12 changed files with 34 additions and 18 deletions

View File

@@ -39,7 +39,7 @@ CWD=$(PWD)
#
DYNAMIC =
CFLAGS = @CFLAGS@
CFLAGS = @CFLAGS@ -D__ANSI_C__=1
INCLUDE = -I@abs_top_builddir@ @CUDD_CPPFLAGS@
LINKFLAGS = -lm
LINKLIBS = @CUDD_LIBS@

View File

@@ -25,7 +25,7 @@ void ADTError(char *name, ADTErrorCodes error, char *proc)
fprintf(stderr,"ADT Error: ");
fprintf(stderr," Module: %s\n",name);
fprintf(stderr," Procedure: %s\n",proc);
fprintf(stderr," Error Code: %s\n",error);
fprintf(stderr," Error Code: %u\n",error);
exit(1);
}
@@ -43,5 +43,5 @@ void ADTWarning(char *name, ADTWarningCodes warning, char *proc)
fprintf(stderr,"ADT Warning: ");
fprintf(stderr," Module: %s\n",name);
fprintf(stderr," Procedure: %s\n",proc);
fprintf(stderr," Warning Code: %s\n",warning);
fprintf(stderr," Warning Code: %u\n",warning);
}

View File

@@ -67,8 +67,8 @@ void ADTWarning(char *name, ADTWarningCodes warning, char *proc);
#else
void ADTError();
void ADTWarning();
void ADTError(void);
void ADTWarning(void);
#endif

View File

@@ -13,6 +13,8 @@
#ifndef APT_H
#define APT_H
#include <stdlib.h>
/* ---------- Defines */
#ifndef ERROR
@@ -52,8 +54,9 @@
#endif
/* ---------- Types */
#ifndef __ANSI_C__
#define __ANSI_C__
#endif
typedef void (*ApplyFunction)(void*);
typedef void (*ApplyFunction1)(void*,void*);

View File

@@ -64,8 +64,10 @@ int start;
if (q)
qi = ((QueueIterator)Allocate(sizeof(_QueueIterator)));
else
ADTError(ADT_QueueIter, E_NullQueue, "QueueIteratorNew");
else {
ADTError(ADT_QueueIter, E_NullQueue, "QueueIteratorNew");
return NULL;
}
if (qi) {
qi->queue = q;
QueueIteratorAbsoluteSeek(qi, start);

View File

@@ -725,13 +725,16 @@ void myexpand(extmanager MyManager, DdNode *Current) {
double CalcProbability(extmanager MyManager, DdNode *Current) {
DdNode *h, *l;
hisnode *Found;
char *curnode, *dynvalue;
hisnode *Found = NULL;
char *curnode; //, *dynvalue;
double lvalue, hvalue, tvalue;
density_integral dynvalue_parsed;
// density_integral dynvalue_parsed;
if (params.debug) {
curnode = GetNodeVarNameDisp(MyManager.manager, MyManager.varmap, Current);
fprintf(stderr, "%s\n", curnode);
} else {
// gcc stupidly complains.
curnode = NULL;
}
if (Current == MyManager.t) return 1.0;
if (Current == MyManager.f) return 0.0;
@@ -811,7 +814,7 @@ static
void PrintNodeQueue(Queue q , extmanager MyManager){
QueueIterator qiter = QueueIteratorNew(q, 1);
fprintf(stderr,"Queue %p is [", *q);
fprintf(stderr,"Queue %p is [", q);
while (qiter->currentItem != NULL) {
DdNode* val = (DdNode*) qiter->currentItem->element;

View File

@@ -320,6 +320,7 @@ int RepairVarcnt(namedvars *varmap);
char* GetNodeVarName(DdManager *manager, namedvars varmap, DdNode *node);
char* GetNodeVarNameDisp(DdManager *manager, namedvars varmap, DdNode *node);
int all_loaded(namedvars varmap, int disp);
int all_loaded_for_deterministic_variables(namedvars varmap, int disp);
/* Traversal */