diff --git a/xtrn/sbl/sbl2smb.c b/xtrn/sbl/sbl2smb.c index f34e416177bafe9fb3f67d3b400f8f05595b9f57..287b8c466e784c8931b35d1e71c064980d19d023 100644 --- a/xtrn/sbl/sbl2smb.c +++ b/xtrn/sbl/sbl2smb.c @@ -59,38 +59,6 @@ smb_t smb; char revision[16]; -/****************************************************************************/ -/* Updates 16-bit "rcrc" with character 'ch' */ -/****************************************************************************/ -void ucrc16(uchar ch, ushort *rcrc) { - ushort i, cy; - uchar nch=ch; - -for (i=0; i<8; i++) { - cy=*rcrc & 0x8000; - *rcrc<<=1; - if (nch & 0x80) *rcrc |= 1; - nch<<=1; - if (cy) *rcrc ^= 0x1021; } -} - -/****************************************************************************/ -/* Returns 16-crc of string (not counting terminating NULL) */ -/****************************************************************************/ -ushort crc16(char *str) -{ - int i=0; - ushort crc=0; - -ucrc16(0,&crc); -while(str[i]) - ucrc16(str[i++],&crc); -ucrc16(0,&crc); -ucrc16(0,&crc); -return(crc); -} - - /****************************************************************************/ /* Converts unix time format (long - time_t) into a char str MM/DD/YY */ /****************************************************************************/ @@ -358,7 +326,7 @@ int main(int argc, char **argv) length+=2; memset(&msg,0,sizeof(smbmsg_t)); - memcpy(msg.hdr.id,"SHD\x1a",4); + memcpy(msg.hdr.msghdr_id,"SHD\x1a",4); msg.hdr.version=smb_ver(); msg.hdr.when_written.time=now; msg.hdr.when_imported.time=now; diff --git a/xtrn/sbl/smb2sbl.c b/xtrn/sbl/smb2sbl.c index bc12a947c97b15e7fb5c17c084ddec2d5db093c8..f564d7e6072f2091b35057d20225812f78b38299 100644 --- a/xtrn/sbl/smb2sbl.c +++ b/xtrn/sbl/smb2sbl.c @@ -144,37 +144,6 @@ time_t dstrtounix(char *instr) return(mktime(&tm)); } -/****************************************************************************/ -/* Updates 16-bit "rcrc" with character 'ch' */ -/****************************************************************************/ -void ucrc16(uchar ch, ushort *rcrc) { - ushort i, cy; - uchar nch=ch; - -for (i=0; i<8; i++) { - cy=*rcrc & 0x8000; - *rcrc<<=1; - if (nch & 0x80) *rcrc |= 1; - nch<<=1; - if (cy) *rcrc ^= 0x1021; } -} - -/****************************************************************************/ -/* Returns 16-crc of string (not counting terminating NULL) */ -/****************************************************************************/ -ushort crc16(char *str) -{ - int i=0; - ushort crc=0; - -ucrc16(0,&crc); -while(str[i]) - ucrc16(str[i++],&crc); -ucrc16(0,&crc); -ucrc16(0,&crc); -return(crc); -} - /****************************************************************************/ /* Truncates white-space chars off end of 'str' */ /* This is a *special* version of trunccrsp that truncates at first CR char */ @@ -206,12 +175,6 @@ int main(int argc, char **argv) fprintf(stderr,"\nSMB2SBL v2.%s-%s - Updates SBL via SMB - Copyright 2003 " "Rob Swindell\n\n",revision,PLATFORM_DESC); -#if 0 - if(putenv("TZ=UCT0")) - fprintf(stderr,"!putenv() FAILED\n"); - tzset(); -#endif - if(argc<3) { fprintf(stderr,"usage: smb2sbl <smb_file> <sbl.dab>\n\n"); fprintf(stderr,"ex: smb2sbl /sbbs/data/subs/syncdata "