linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

polished code to suppress warnings

Browse Source 
SKIPPED:
	psi/makefile_linux
This commit is contained in:
zolliker
2006-03-23 12:39:11 +00:00
parent 733832c8b6
commit 1aef9afabb
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SCinter.c
View File

@ -74,7 +74,6 @@
#include "lld_str.h" #include "lld_str.h"
static void printList(SConnection *pCon, int listID); static void printList(SConnection *pCon, int listID);
static void freeList(int listID); static void freeList(int listID);
int compareStringNode(void *pStr1, void **ppStr2);
#define MAXLEN 256 #define MAXLEN 256
#define MAXPAR 100 #define MAXPAR 100
@ -535,6 +534,12 @@ static void printAll(SicsInterp *pSics, SConnection *pCon)
SCWrite(pCon,pBueffel,eStatus); SCWrite(pCon,pBueffel,eStatus);
} }
} }
/*------------------------------------------------------------------------*/
/* compareStringNode wraps strcmp for use in findNode(LLD module) calls */
int compareStringNode(const void *pStr1, const void *ppStr2)
{
return strcmp((char *)pStr1,*(char **)ppStr2);
}
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
printAllTypes prints the list of types of objects instantiated on the printAllTypes prints the list of types of objects instantiated on the
CommandList. CommandList.
@ -1001,13 +1006,6 @@ static void freeList(int listID)
} while(0!=LLDnodePtr2First(listID)); } while(0!=LLDnodePtr2First(listID));
LLDdelete(listID); LLDdelete(listID);
} }
/*------------------------------------------------------------------------*/
/* compareStringNode wraps strcmp for use in findNode(LLD module) calls */
int compareStringNode(void *pStr1, void **ppStr2)
{
return strcmp((char *)pStr1,(char *)(*ppStr2));
}
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
void RemoveStartupCommands(void) void RemoveStartupCommands(void)
{ {

2
makefile_slinux
View File

@ -17,7 +17,7 @@ CC = gcc
CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 -DNXXML $(NI) \ CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 -DNXXML $(NI) \
-Ipsi/hardsup -I. \ -Ipsi/hardsup -I. \
-fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY) \ -fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY) \
-Wall -Wno-unused -Wno-comment -Wno-switch -Wall -Wno-unused -Wno-comment -Wno-switch -Werror
BINTARGET = bin BINTARGET = bin
EXTRA=nintf.o EXTRA=nintf.o

4
napi4.c
View File

@ -21,7 +21,7 @@
For further information, see <http://www.neutron.anl.gov/NeXus/> For further information, see <http://www.neutron.anl.gov/NeXus/>
$Id: napi4.c,v 1.6 2006/03/03 15:30:55 koennecke Exp $ $Id: napi4.c,v 1.7 2006/03/23 12:39:11 zolliker Exp $
----------------------------------------------------------------------------*/ ----------------------------------------------------------------------------*/
#include <stdlib.h> #include <stdlib.h>
@ -1236,7 +1236,7 @@ extern void *NXpData;
{ {
pNexusFile pFile; pNexusFile pFile;
pFile = NXIassert (fid); pFile = NXIassert (fid);
printf("HDF4 link: iTag = %d, iRef = %d, target=\"%s\"\n", sLink->iTag, sLink->iRef, sLink->targetPath); printf("HDF4 link: iTag = %ld, iRef = %ld, target=\"%s\"\n", sLink->iTag, sLink->iRef, sLink->targetPath);
return NX_OK; return NX_OK;
} }

2
nxxml.c
View File

@ -866,7 +866,7 @@ static char *formatAttributeData(void *data, int datalen, int iType){
break; break;
} }
if(intData){ if(intData){
snprintf(number,79,"%s%d",type,iValue); snprintf(number,79,"%s%ld",type,iValue);
} else { } else {
snprintf(number,79,"%s%f",type,dValue); snprintf(number,79,"%s%f",type,dValue);
} }

4
sics.h
View File

@ -15,6 +15,10 @@
ePreset ePreset
}CounterMode; }CounterMode;
/* the following line suppresses const declarations in tcl.h.
-> makes the compiler happy M.Z. */
#define NO_CONST
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>