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

- cleaned up makefiles

Browse Source 
- polished code to avoid warnings
This commit is contained in:
zolliker
2005-03-08 11:12:23 +00:00
parent 350c410bdf
commit 94075f06c7
60 changed files with 189 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/SerPortServer.c
View File

@ -141,6 +141,7 @@
#include <signal.h>
#include <ctype.h>
#include <errno.h>
#include <time.h>
#include <sys/socket.h>
#include <sys/time.h>
@ -2381,7 +2382,7 @@ static int RS__MAX_ASYNCH = 20; /* Asynch "ports" 0 - 19 will be allowed */
Ts_info = calloc (RS__MAX_ASYNCH, sizeof (Ts_info[0]));
if (Ts_info == NULL) {
printf (" Unable to allocate space for Ts_info\n");
freeAll (Cl_info); exit (EXIT_FAILURE);
freeAll (); exit (EXIT_FAILURE);
}
for (i = 0; i < RS__MAX_ASYNCH; i++) Ts_info[i].status = TS_SS_IDLE;
/*-----------------------------------------------------------------------*/
@ -2580,7 +2581,8 @@ static int RS__MAX_ASYNCH = 20; /* Asynch "ports" 0 - 19 will be allowed */
&buff[4]);
traceWrite ();
}else {
printf ("%.15s - USR1 signal detected. There is no trace buffer.\n");
printf ("%.15s - USR1 signal detected. There is no trace buffer.\n",
&buff[4]);
}
fflush (NULL);
signal (SIGUSR1, USR1_Handler); /* Re-enable USR1 signal */

6
utils/el734.c
View File

@ -1147,13 +1147,13 @@
switch (Cmnd_fmt[i]) {
case ONE_INT:
sscanf (rply_ptr->rply, "%d",
((char *) state) + Offsets[indx]);
(int *)(((char *) state) + Offsets[indx]));
indx++;
break;
case TWO_INT:
sscanf (rply_ptr->rply, "%d %d",
((char *) state) + Offsets[indx],
((char *) state) + Offsets[indx+1]);
(int *)(((char *) state) + Offsets[indx]),
(int *)(((char *) state) + Offsets[indx+1]));
indx++; indx++;
break;
case ONE_STRING:

2
utils/make_gen
View File

@ -10,8 +10,6 @@
.SUFFIXES:
.SUFFIXES: .c .o
VPATH=$(SRC)
ROOT=../..
HLIB=../hardsup/libhlib.a
LIBS = -L/usr/X11R6/lib -lX11
#----------------------------------------------------------

24
utils/makefile
View File

@ -1,15 +1,6 @@
# Forwards the execution to a version specific makefile.
# SICS_VERSION must be defined, else usage is printed
# M. Zolliker 03.2005
VERS_UNDEFINED=
VERS_UNDEFINED$(SICS_VERSION)=version_undefined
INCL_MF=makefile_$(SICS_VERSION)
-include $(INCL_MF)
version_undefined:
default:
@ echo ""
@ echo "Usage:"
@ echo ""
@ -18,17 +9,4 @@ version_undefined:
@ echo ' where makefile_xxx is one of'
@ echo ""
@ ls -1 makefile_* | pr -t -o 4
@ echo ""
@ echo "Or, more convenient, define the following in the login script"
@ echo ""
@ echo " setenv SICS_VERSION version_xxx (assume we are using tcsh)"
@ echo ""
@ echo " where version_xxx is one of"
@ echo ""
@ ls -1 makefile_* | cut -b 10-99 | pr -t -o 4
@ echo ""
@ echo "and then use simply"
@ echo ""
@ echo " make [target]"
@ echo ""

2
utils/makefile_alpha
View File

@ -9,7 +9,7 @@
include ../../alpha_def
CC = cc
CFLAGS = -std1 -g $(DFORTIFY) -I$(SRC). -I$(ROOT)/psi/hardsup/$(SRC)
CFLAGS = -std1 -g $(DFORTIFY) -I../hardsup -I.
ALPHA = el737 el734 el734_test
# -- the following macros are used as a replacement for some automatic variables

6
utils/makefile_linux
View File

@ -6,10 +6,10 @@
# Markus Zolliker, Oct 2003
#--------------------------------------------------------------------------
include ../../$(SRC)linux_def
include ../../linux_def
CC = gcc
CFLAGS = -g -DLINUX $(DFORTIFY) -I$(SRC). -I$(ROOT)/psi/hardsup/$(SRC)
CFLAGS = -g -DLINUX $(DFORTIFY) -I../hardsup -I.
# -- the following macros are used as a replacement for some automatic variables
# due to different make versions.
@ -22,4 +22,4 @@ Q=$^
F=$<
C=$<
include $(SRC)make_gen
include make_gen