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

Changes to make SICS compile on OSX Maverick with clang

Browse Source
This commit is contained in:
Mark Könnecke
2014-03-14 09:48:14 +01:00
parent a43e3838e3
commit bc31c6cd1e
30 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ascon.c
View File

@ -40,7 +40,7 @@ static int CreateSocketAdress(struct sockaddr_in *sockaddrPtr, /* Socket addres
(char *) hostent->h_addr_list[0], (size_t) hostent->h_length); (char *) hostent->h_addr_list[0], (size_t) hostent->h_length);
} else { } else {
addr.s_addr = inet_addr(host); addr.s_addr = inet_addr(host);
if (addr.s_addr == (unsigned long) -1) { if (addr.s_addr == (unsigned int) -1) {
return 0; /* error */ return 0; /* error */
} }
} }
@ -73,7 +73,7 @@ void AsconError(Ascon *a, char *msg, int errorno)
char *state; char *state;
char num[8]; char num[8];
if (a->state < 0 || a->state >= AsconMaxState) { if ( a->state >= AsconMaxState) {
state = "bad state"; state = "bad state";
} else { } else {
state = stateText[a->state]; state = stateText[a->state];

2
asyncqueue.c
View File

@ -85,7 +85,7 @@ static int CreateSocketAdress(struct sockaddr_in *sockaddrPtr, /* Socket addres
(char *) hostent->h_addr_list[0], (size_t) hostent->h_length); (char *) hostent->h_addr_list[0], (size_t) hostent->h_length);
} else { } else {
addr.s_addr = inet_addr(host); addr.s_addr = inet_addr(host);
if (addr.s_addr == (unsigned long) -1) { if (addr.s_addr == (unsigned int) -1) {
return 0; /* error */ return 0; /* error */
} }
} }

2
asynnet.c
View File

@ -237,7 +237,7 @@ int ANETconnect(char *name, int iPort)
} else { } else {
/* check for aaa.bbbb.ccc.dddd */ /* check for aaa.bbbb.ccc.dddd */
addr.s_addr = inet_addr(name); addr.s_addr = inet_addr(name);
if(addr.s_addr == (unsigned long) -1) { if(addr.s_addr == (unsigned int) -1) {
anetLog(ANETERROR, "Failed to locate host: %s", name); anetLog(ANETERROR, "Failed to locate host: %s", name);
return ANETOPENFAIL; return ANETOPENFAIL;
} }

5
chadapter.c
View File

@ -174,8 +174,9 @@ static void KillAdapter(void *pData)
if (self->pInt) if (self->pInt)
free(self->pInt); free(self->pInt);
if (self->pParName); if (self->pParName){
free(self->pParName); free(self->pParName);
}
free(self); free(self);
} }

2
devexec.c
View File

@ -498,7 +498,7 @@ int StopExe(pExeList self, char *name)
assert(self); assert(self);
/* if not active, nothing to do */ /* if not active, nothing to do */
if ((self->pOwner == NULL) ) { if (self->pOwner == NULL ) {
self->iRun = 0; self->iRun = 0;
return 1; return 1;
} }

2
fourmess.c
View File

@ -393,7 +393,7 @@ static int FourMessStoreIntern(pSICSOBJ self, SConnection * pCon,
double fHkl[3], double fPosition[4], char *extra) double fHkl[3], double fPosition[4], char *extra)
{ {
pFourMess priv = self->pPrivate; pFourMess priv = self->pPrivate;
float fSum, fSigma, fTemp, fStep, fPreset; float fSum, fSigma, fTemp, fStep = .0, fPreset =.0;
int i, iLF, iRet, iNP, ii; int i, iLF, iRet, iNP, ii;
long *lCounts = NULL; long *lCounts = NULL;
pEVControl pEva = NULL; pEVControl pEva = NULL;

4
frame.c
View File

@ -19,8 +19,8 @@
#include "HistMem.h" #include "HistMem.h"
#include "HistMem.i" #include "HistMem.i"
#include "HistDriv.i" #include "HistDriv.i"
#include "sicspsi/hardsup/sinqhm.h" #include <hardsup/sinqhm.h>
#include "sicspsi/sinqhmdriv.i" #include <sinqhmdriv.i>
#include "nxdict.h" #include "nxdict.h"
#include "frame.h" #include "frame.h"

2
histmem.c
View File

@ -1129,7 +1129,7 @@ void HMListOption(pHistMem self, SConnection * pCon)
static pDynString formatTOF(pHistMem self) static pDynString formatTOF(pHistMem self)
{ {
const float *timebin; const float *timebin;
int iLength, i, delay, delta; int iLength, i, delay, delta = .0;
char number[20]; char number[20];
pDynString result = NULL; pDynString result = NULL;

3
hmdata.c
View File

@ -469,9 +469,6 @@ long sumHMDataRectangle(pHistMem hist, SConnection * pCon,
return -1; return -1;
break; break;
} }
if (lSum < 0) {
lSum = -lSum;
}
return lSum; return lSum;
} }

2
initializer.c
View File

@ -162,7 +162,7 @@ static int RemoveObject(SConnection * con, SicsInterp * sics,
p = strchr(className, ' '); p = strchr(className, ' ');
if (p) { if (p) {
snprintf(shortClassName, sizeof shortClassName, "%.*s", snprintf(shortClassName, sizeof shortClassName, "%.*s",
p - className, className); (int)(p - className), className);
cmdin = (CmdInitializer) GetInitializer("Object", shortClassName); cmdin = (CmdInitializer) GetInitializer("Object", shortClassName);
} }
} }

4
integrate.c
View File

@ -211,7 +211,7 @@ static int FindLimit(pIntegData self, int iStart, int iSign)
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
static int DoIntegrate(pIntegData self, float *fSum, float *fVariance) static int DoIntegrate(pIntegData self, float *fSum, float *fVariance)
{ {
long lLeftBack, lRightBack, lBackMean; long lLeftBack = 0, lRightBack, lBackMean;
int i, iRes = 1; int i, iRes = 1;
float fScan, fBackVar, fLeft, fRight, fN, fNP, fNB, fSumm; float fScan, fBackVar, fLeft, fRight, fN, fNP, fNB, fSumm;
float fMLeft, fMRight; float fMLeft, fMRight;
@ -224,13 +224,11 @@ static int DoIntegrate(pIntegData self, float *fSum, float *fVariance)
for (i = 0, lLeftBack = 0; i < self->iLeft; i++) { for (i = 0, lLeftBack = 0; i < self->iLeft; i++) {
lLeftBack += self->lCounts[i]; lLeftBack += self->lCounts[i];
} }
lLeftBack = lLeftBack;
/* sum the right background */ /* sum the right background */
for (i = self->iRight, lRightBack = 0; i < self->iCounts; i++) { for (i = self->iRight, lRightBack = 0; i < self->iCounts; i++) {
lRightBack += self->lCounts[i]; lRightBack += self->lCounts[i];
} }
lRightBack = lRightBack;
/* sum all of it */ /* sum all of it */

6
macosx_def
View File

@ -8,6 +8,8 @@
#FORTIFYOBJ= fortify.o strdup.o #FORTIFYOBJ= fortify.o strdup.o
#DFORTIFY= -pg #DFORTIFY= -pg
MFLAGS=-f makefile_linux$(DUMMY) MFLAGS=-f makefile_macosx
HDFROOT=/usr/pkg
HDFROOT=/Users/Shared

2
makefile_linux
View File

@ -14,7 +14,7 @@ NI=
#NIOBJ= nigpib.o #NIOBJ= nigpib.o
#NILIB=$(SINQDIR)/lib/cib.o #NILIB=$(SINQDIR)/lib/cib.o
include linux_def include $(SICSROOT)/sics/linux_def
CC = gcc CC = gcc
CFLAGS = -I$(HDFROOT)/include -I/usr/include/hdf -I$(TCLINC) -DHDF4 -DHDF5 \ CFLAGS = -I$(HDFROOT)/include -I/usr/include/hdf -I$(TCLINC) -DHDF4 -DHDF5 \

19
makefile_macosx
View File

@ -5,6 +5,7 @@
# Mark Koennecke 1996-2001 # Mark Koennecke 1996-2001
# Markus Zolliker, March 2003 # Markus Zolliker, March 2003
# Mark Koennecke, July 2008 # Mark Koennecke, July 2008
# Mark Koennecke, March 2014 for Maverick
#========================================================================== #==========================================================================
# assign if the National Instrument GPIB driver is available # assign if the National Instrument GPIB driver is available
SINQDIR=/Users/Shared SINQDIR=/Users/Shared
@ -12,23 +13,21 @@ SINQDIR=/Users/Shared
#NIOBJ= nigpib.o #NIOBJ= nigpib.o
#NILIB=$(SINQDIR)/sl5/lib/cib.o #NILIB=$(SINQDIR)/sl5/lib/cib.o
SICSROOT=/Users/konnecke/src
include macosx_def include macosx_def
CC = gcc CC = clang
CFLAGS = -I$(HDFROOT)/include -I/sw/include -DNXXML -DHDF5 -DHDF4 $(NI) -DMACOSX \ CFLAGS = -I$(HDFROOT)/include -I/usr/local/include -DNXXML -DHDF5 $(NI) -DMACOSX \
-Ipsi/hardsup -I. \ -I$(SICSROOT)/psi/hardsup -I$(SICSROOT)/sicspsi -I. -I/usr/pkg/include \
-Werror -DNONINTF -g $(DFORTIFY) \ -Werror -DNONINTF -g $(DFORTIFY) \
-Wall -Wno-unused -Wno-comment -Wno-switch -Wall -Wno-unused -Wno-comment -Wno-switch
BINTARGET = bin BINTARGET = bin
EXTRA=nintf.o EXTRA=nintf.o
SUBLIBS = psi/libpsi.a psi/hardsup/libhlib.a matrix/libmatrix.a \ SUBLIBS = $(SICSROOT)/sicspsi/libpsi.a $(SICSROOT)/sicspsi/hardsup/libhlib.a matrix/libmatrix.a \
psi/tecs/libtecsl.a $(SICSROOT)/sicspsi/tecs/libtecsl.a
LIBS = -L$(HDFROOT)/lib -L/sw/lib $(SUBLIBS) $(NILIB)\ LIBS = -L$(HDFROOT)/lib -L/usr/local/lib $(SUBLIBS) $(NILIB)\
-ltcl $(HDFROOT)/lib/libhdf5.a -lmfhdf -ldf \ -ltcl -lhdf5 -lNeXus -ljson -lghttp -ldl -lz -lmxml -lm -lc
$(HDFROOT)/lib/libsz.a \
$(HDFROOT)/lib/libjson.a -ljpeg \
-ldl -lz -lmxml $(HDFROOT)/lib/libghttp.a -lm -lc
include make_gen include make_gen

2
network.c
View File

@ -98,7 +98,7 @@ static int CreateSocketAdress(struct sockaddr_in *sockaddrPtr, /* Socket addres
(char *) hostent->h_addr_list[0], (size_t) hostent->h_length); (char *) hostent->h_addr_list[0], (size_t) hostent->h_length);
} else { } else {
addr.s_addr = inet_addr(host); addr.s_addr = inet_addr(host);
if (addr.s_addr == (unsigned long) -1) { if (addr.s_addr == (unsigned int) -1) {
return 0; /* error */ return 0; /* error */
} }
} }

1
nxinter_wrap.c
View File

@ -3829,7 +3829,6 @@ SWIGRUNTIME void SWIG_InitializeModule(void *clientdata)
swig_module_info *module_head, *iter; swig_module_info *module_head, *iter;
int found; int found;
clientdata = clientdata;
/* check to see if the circular list has been setup, if not, set it up */ /* check to see if the circular list has been setup, if not, set it up */
if (swig_module.next == 0) { if (swig_module.next == 0) {

2
remob.c
View File

@ -995,7 +995,7 @@ int RemobCreate(SConnection * pCon, SicsInterp * pSics, void *pData,
SCPrintf(pCon, eError, "ERROR: illegal host:port"); SCPrintf(pCon, eError, "ERROR: illegal host:port");
return 0; return 0;
} }
snprintf(host, sizeof host, "%.*s", p - argv[3], argv[3]); snprintf(host, sizeof host, "%.*s", (int)(p - argv[3]), argv[3]);
remserver = RemServerInit(argv[2], host, atoi(p + 1)); remserver = RemServerInit(argv[2], host, atoi(p + 1));
} }
if (!remserver) { if (!remserver) {

2
sansbc.c
View File

@ -188,7 +188,7 @@ static int StatCmd(pSICSOBJ self, SConnection *pCon, pHdb commandNode,
return 0; return 0;
} }
max = -9999; max = -9999;
min = 99999.99; min = 99999;
length = dim[0]*dim[1]; length = dim[0]*dim[1];
for(i = 0, sum = 0; i < length; i++){ for(i = 0, sum = 0; i < length; i++){
sum += data[i]; sum += data[i];

4
scan.c
View File

@ -1277,7 +1277,7 @@ static int ScanDynInterest(int iEvent, void *pEventData, void *pUser)
if (pCount != NULL) { if (pCount != NULL) {
lVal = pCount->lCount; lVal = pCount->lCount;
} else { } else {
lVal = -9999.99; lVal = -9999;
} }
snprintf(pBueffel, 255, "%s.scanpoint = {%d %f %ld}", snprintf(pBueffel, 255, "%s.scanpoint = {%d %f %ld}",
self->objectName, i, fVal, lVal); self->objectName, i, fVal, lVal);
@ -1624,7 +1624,7 @@ int ScanWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
float *fData = NULL; float *fData = NULL;
int lNP; int lNP;
int iChannel; int iChannel;
int iRet, iMode, i; int iRet = 0, iMode, i;
char *pPtr = NULL, pItem[20]; char *pPtr = NULL, pItem[20];
long *lData = NULL, lID; long *lData = NULL, lID;
int *iData; int *iData;

2
scriptcontext.c
View File

@ -536,7 +536,7 @@ static char *SctActionHandler(void *actionData, char *lastReply,
} else { } else {
l = strlen(origScript); l = strlen(origScript);
} }
snprintf(eprop, sizeof eprop, "error_in_%.*s", l, origScript); snprintf(eprop, sizeof eprop, "error_in_%.*s", (int)l, origScript);
emsg = GetHdbProp(node, eprop); emsg = GetHdbProp(node, eprop);
cnt = 0; cnt = 0;
if (emsg != NULL) { if (emsg != NULL) {

2
sctcomtask.c
View File

@ -27,7 +27,7 @@
#include "sicsutil.h" #include "sicsutil.h"
#include "sicshipadaba.h" #include "sicshipadaba.h"
static unsigned int mamaID = 0L; static int mamaID = 0L;
extern char *ParText(Hdb * cmdNode, char *name, extern char *ParText(Hdb * cmdNode, char *name,
int nPar, char *defaultValue); int nPar, char *defaultValue);

2
selector.c
View File

@ -376,7 +376,7 @@ int MonoAction(SConnection * pCon, SicsInterp * pSics, void *pData,
pSicsSelector pSelf = NULL; pSicsSelector pSelf = NULL;
TokenList *pList = NULL; TokenList *pList = NULL;
TokenList *pCurrent; TokenList *pCurrent;
int iRet; int iRet = 0;
char pBueffel[132]; char pBueffel[132];
char pName[132]; char pName[132];
float fVal; float fVal;

2
sicshdbfactory.c
View File

@ -108,7 +108,7 @@ static int MakePlainNode(pHdb parent, char *name, SConnection * pCon,
static int MakeScriptNode(pHdb parent, char *name, SConnection * pCon, static int MakeScriptNode(pHdb parent, char *name, SConnection * pCon,
int argc, char *argv[]) int argc, char *argv[])
{ {
int type, length; int type, length = 0;
pHdb child = NULL; pHdb child = NULL;
hdbValue v; hdbValue v;

4
sicshipadaba.c
View File

@ -2536,7 +2536,7 @@ static int ZipGetHdbNode(SConnection * pCon, SicsInterp * pSics,
{ {
pHdb targetNode = NULL; pHdb targetNode = NULL;
char error[512], oriPath[512]; char error[512], oriPath[512];
int status; int status = 0;
hdbValue newValue; hdbValue newValue;
pDynString parData = NULL, result= NULL; pDynString parData = NULL, result= NULL;
Protocol protocol = normal_protocol; Protocol protocol = normal_protocol;
@ -2584,7 +2584,7 @@ static int ZipReadHdbNode(SConnection * pCon, SicsInterp * pSics,
{ {
pHdb targetNode = NULL; pHdb targetNode = NULL;
char error[512], oriPath[512]; char error[512], oriPath[512];
int status; int status = 0;
pDynString parData = NULL, result= NULL; pDynString parData = NULL, result= NULL;
Protocol protocol = normal_protocol; Protocol protocol = normal_protocol;
OutCode outCode; OutCode outCode;

8
singlex.c
View File

@ -70,7 +70,7 @@ static MotorFunction TextToFunc(char *txt)
} }
count++; count++;
} }
return -1; return None;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -112,7 +112,7 @@ static int ConfigureCmd(pSICSOBJ self, SConnection * pCon,
} }
mf = TextToFunc(v.v.text); mf = TextToFunc(v.v.text);
if (mf < 0) { if (mf == None) {
SCPrintf(pCon, eError, SCPrintf(pCon, eError,
"ERROR: failed to map %s to configuration parameter", "ERROR: failed to map %s to configuration parameter",
v.v.text); v.v.text);
@ -167,7 +167,7 @@ static int MotorCmd(pSICSOBJ self, SConnection * pCon, pHdb commandNode,
} }
mf = TextToFunc(par[0]->value.v.text); mf = TextToFunc(par[0]->value.v.text);
if (mf < 0) { if (mf == None) {
SCPrintf(pCon, eError, "ERROR: %s is not a four circle motor", SCPrintf(pCon, eError, "ERROR: %s is not a four circle motor",
par[0]->value.v.text); par[0]->value.v.text);
return 0; return 0;
@ -198,7 +198,7 @@ static int MotorNamCmd(pSICSOBJ self, SConnection * pCon, pHdb commandNode,
} }
mf = TextToFunc(par[0]->value.v.text); mf = TextToFunc(par[0]->value.v.text);
if (mf < 0) { if (mf == None) {
SCPrintf(pCon, eError, "ERROR: %s is not a four circle motor", SCPrintf(pCon, eError, "ERROR: %s is not a four circle motor",
par[0]->value.v.text); par[0]->value.v.text);
return 0; return 0;

2
singlex.h
View File

@ -16,7 +16,7 @@
#include "singlediff.h" #include "singlediff.h"
typedef enum { typedef enum {
TwoTheta, Omega, Chi, Phi, Nu, Sgu, Sgl TwoTheta, Omega, Chi, Phi, Nu, Sgu, Sgl, None
} MotorFunction; } MotorFunction;
pMotor SXGetMotor(MotorFunction m); pMotor SXGetMotor(MotorFunction m);
const char *SXGetMotorName(MotorFunction m); const char *SXGetMotorName(MotorFunction m);

2
splitter.c
View File

@ -56,7 +56,7 @@ static TokenList *CreateToken(TokenList * pN, TokenList * pP)
static CharType CheckSpecial(char *pWord) static CharType CheckSpecial(char *pWord)
{ {
CharType eRes = eText; CharType eRes = eeText;
int iFlag = 0; int iFlag = 0;
if (isspace(pWord[0])) if (isspace(pWord[0]))

4
tasscanub.c
View File

@ -184,7 +184,7 @@ static float GetVarFloat(char *name)
static int TASUBHeader(pScanData self) static int TASUBHeader(pScanData self)
{ {
pTASdata pTAS = (pTASdata) self->pSpecial; pTASdata pTAS = (pTASdata) self->pSpecial;
int i, iCount, status, iFileNO; int i, iCount, status, iFileNO = 0;
char pBueffel[1024], pHeader[1024], pWork[132], pWork2[60], pTen[12], char pBueffel[1024], pHeader[1024], pWork[132], pWork2[60], pTen[12],
*pcPtr; *pcPtr;
time_t iDate; time_t iDate;
@ -201,7 +201,7 @@ static int TASUBHeader(pScanData self)
tasReflection r; tasReflection r;
double kfix; double kfix;
pSicsVariable sVar = NULL; pSicsVariable sVar = NULL;
float f1, f2, f3, f4; float f1=.0, f2=.0, f3=.0, f4=.0;
assert(self); assert(self);
assert(pTAS); assert(pTAS);

2
tasublib.c
View File

@ -163,7 +163,7 @@ double tasAngleBetweenReflections(MATRIX B, tasReflection r1,
tasReflection r2) tasReflection r2)
{ {
MATRIX chi1, chi2, h1, h2; MATRIX chi1, chi2, h1, h2;
double angle; double angle = .0;
h1 = makeVector(); h1 = makeVector();
if (h1 == NULL) { if (h1 == NULL) {

2
ubfour.c
View File

@ -588,7 +588,7 @@ int searchIndex(lattice direct, double lambda, double two_theta,
double angleBetweenReflections(MATRIX B, reflection r1, reflection r2) double angleBetweenReflections(MATRIX B, reflection r1, reflection r2)
{ {
MATRIX chi1, chi2, h1, h2; MATRIX chi1, chi2, h1, h2;
double angle; double angle = .0;
h1 = makeVector(); h1 = makeVector();
if (h1 == NULL) { if (h1 == NULL) {