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

Merging release 2.0 branch with CVS trunk

Browse Source 
r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines
This commit is contained in:
Ferdi Franceschini
2008-05-30 10:26:57 +10:00
committed by Douglas Clowes
parent 4a937e1608
commit 0749b0effa
125 changed files with 8541 additions and 1810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
site_ansto/hardsup/asynsrv_utility.c
View File

@@ -680,7 +680,7 @@
*/ struct AsynSrv__info *asyn_info) {
int status;
char cmnd[8], rply[8];
//char cmnd[8], rply[8];
/*----------------------------------------------
** Pre-set the routine name (in case of error)
*/
@@ -898,8 +898,8 @@
/* ==================
*/ char *par_id,
...) {
int i;
char buff[4];
//int i;
//char buff[4];
va_list ap; /* Pointer to variable args */
char *txt_ptr;
int intval;
@@ -971,7 +971,7 @@
int *my_errno,
int *vaxc_errno) {
int i, j, k;
int i;//, j, k;
char buff[80];
if (AsynSrv_call_depth <= 0) {
@@ -1034,7 +1034,7 @@
*/ struct AsynSrv__info *asyn_info) {
int status;
char cmnd[8], rply[8];
//char cmnd[8], rply[8];
/*----------------------------------------------
** Pre-set the routine name (in case of error)
*/
@@ -1124,25 +1124,25 @@
*/ struct AsynSrv__info *asyn_info) {
int i, status;
int my_skt;
char old_time_out[4];
union {
char chars[4];
int val;
} time_out;
//int my_skt;
//char old_time_out[4];
//union {
// char chars[4];
// int val;
//} time_out;
char buff[128];
struct RS__MsgStruct s_buff;
struct RS__RespStruct r_buff;
unsigned int oto_len, oto_status;
struct hostent *rmt_hostent;
struct in_addr *rmt_inet_addr_pntr;
struct in_addr rmt_inet_addr;
int rmt_sockname_len;
struct sockaddr_in lcl_sockname;
struct sockaddr_in rmt_sockname;
//struct RS__MsgStruct s_buff;
//struct RS__RespStruct r_buff;
//unsigned int oto_len, oto_status;
//struct hostent *rmt_hostent;
//struct in_addr *rmt_inet_addr_pntr;
//struct in_addr rmt_inet_addr;
//int rmt_sockname_len;
//struct sockaddr_in lcl_sockname;
//struct sockaddr_in rmt_sockname;
char *errtxt_ptr;
int errcode, my_errno, my_vaxc_errno;
//char *errtxt_ptr;
//int errcode, my_errno, my_vaxc_errno;
/*--------------------------------------------------------
*/
asyn_info->skt = 0;
@@ -1225,17 +1225,17 @@
/* ===============
*/ struct AsynSrv__info *asyn_info) {
int i, status;
int status; //,i;
int my_skt;
char old_time_out[4];
union {
char chars[4];
int val;
} time_out;
//char old_time_out[4];
//union {
// char chars[4];
// int val;
//} time_out;
char buff[128];
struct RS__MsgStruct s_buff;
struct RS__RespStruct r_buff;
unsigned int oto_len, oto_status;
//unsigned int oto_len, oto_status;
struct hostent *rmt_hostent;
struct in_addr *rmt_inet_addr_pntr;
struct in_addr rmt_inet_addr;
@@ -1243,8 +1243,8 @@
struct sockaddr_in lcl_sockname;
struct sockaddr_in rmt_sockname;
char *errtxt_ptr;
int errcode, my_errno, my_vaxc_errno;
//char *errtxt_ptr;
//int errcode, my_errno, my_vaxc_errno;
/*--------------------------------------------------------
*/
asyn_info->skt = 0;
@@ -1478,7 +1478,7 @@
int i, status, c_len, size, max_size, ncmnds;
int bytes_to_come, bytes_left;
char *nxt_byte_ptr;
char err_text[80];
// char err_text[80];
char text[20];
va_list ap; /* Pointer to variable args */
char *txt_ptr;
@@ -1724,7 +1724,7 @@
int i, status, size, max_size, ncmnds;
int bytes_to_come, bytes_left;
char *nxt_byte_ptr;
char err_text[80];
//char err_text[80];
char text[20];
va_list ap; /* Pointer to variable args */
int *c_len, s_len;
@@ -2046,7 +2046,7 @@
int state) {
int status;
char cmnd[8], rply[8];
char cmnd[8];//, rply[8];
/*----------------------------------------------
** Pre-set the routine name (in case of error)
*/
@@ -2091,7 +2091,7 @@
*/ struct AsynSrv__info *asyn_info) {
int status;
char cmnd[8], rply[8];
//char cmnd[8], rply[8];
/*----------------------------------------------
** Pre-set the routine name (in case of error)
*/