code cleanup

This commit is contained in:
Michiel Broek
2004-01-28 21:10:56 +00:00
parent 861e90e2b2
commit c62614ef84
26 changed files with 154 additions and 252 deletions

View File

@@ -4,7 +4,7 @@
* Purpose ...............: Dupe checking.
*
*****************************************************************************
* Copyright (C) 1997-2002
* Copyright (C) 1997-2004
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10
@@ -115,18 +115,14 @@ int CheckDupe(unsigned long crc, int idx, int max)
dupes[idx].crcs[dupes[idx].count] = test;
dupes[idx].count++;
}
Syslog('N', "Loaded %d dupe records in %s", dupes[idx].count++, files[idx]);
fclose(fil);
free(dfile);
dupes[idx].loaded = TRUE;
dupes[idx].max = max;
}
// Syslog('N', "dupetest %08x %s %d", crc, files[idx], max);
for (i = 0; i < dupes[idx].count; i++) {
if (dupes[idx].crcs[i] == crc) {
// Syslog('N', "dupe at %d", i);
return TRUE;
}
}
@@ -134,7 +130,6 @@ int CheckDupe(unsigned long crc, int idx, int max)
* Not a dupe, append new crc value
*/
dupes[idx].crcs[dupes[idx].count] = crc;
// Syslog('N', "Added new dupe at %d", dupes[idx].count);
dupes[idx].count++;
dupes[idx].changed = TRUE;
@@ -155,7 +150,6 @@ void CloseDdb(int idx)
FILE *fil;
dfile = calloc(PATH_MAX, sizeof(char));
// Syslog('N', "Checking %s.dupe", files[idx]);
if (dupes[idx].loaded) {
if (dupes[idx].changed) {
if (dupes[idx].count > dupes[idx].max)
@@ -164,7 +158,6 @@ void CloseDdb(int idx)
start = 0;
sprintf(dfile, "%s/etc/%s.dupe", getenv("MBSE_ROOT"), files[idx]);
if ((fil = fopen(dfile, "w"))) {
Syslog('N', "Writing dupes %d to %d", start, dupes[idx].count);
for (j = start; j < dupes[idx].count; j++)
fwrite(&dupes[idx].crcs[j], sizeof(unsigned long), 1, fil);
fclose(fil);

View File

@@ -1,10 +1,10 @@
/*****************************************************************************
*
* $id$
* $Id$
* Purpose ...............: Userrecord Access
*
*****************************************************************************
* Copyright (C) 1997-2002
* Copyright (C) 1997-2004
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10

View File

@@ -4,7 +4,7 @@
* Purpose ...............: Mangle a unix name to DOS 8.3 filename
*
*****************************************************************************
* Copyright (C) 1997-2002
* Copyright (C) 1997-2004
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10
@@ -120,7 +120,7 @@ char *safe_strcpy(char *dest,const char *src, size_t maxlength)
size_t len;
if (!dest) {
Syslog('f', "ERROR: NULL dest in safe_strcpy");
Syslog('+', "ERROR: NULL dest in safe_strcpy");
return NULL;
}
@@ -263,7 +263,7 @@ int is_8_3( char *fname)
init_chartest();
for (i = 0; i < strlen(fname); i++) {
if (isillegal(fname[i])) {
Syslog('f', "Illegal character in filename");
Syslog('+', "Illegal character in filename");
return FALSE;
}
}
@@ -378,7 +378,6 @@ void mangle_name_83(char *s)
for (i = 0; i < strlen(q); i++)
*p++ = q[i];
*p++ = '\0';
// Syslog('f', "name with new extension => \"%s\"", s);
}
/*
@@ -398,7 +397,6 @@ void mangle_name_83(char *s)
} else {
crc16 = crc16xmodem(s, strlen(s));
}
// Syslog('f', "crc16xmodem(%s) %d", s, crc16);
tu(s);
@@ -463,7 +461,6 @@ void name_mangle(char *OutName)
*/
if (!is_8_3(OutName)) {
mangle_name_83(OutName);
// Syslog('f',"name_mangle(%s) ==> [%s]", p, OutName);
} else {
/*
* No mangling needed, convert to uppercase
@@ -471,7 +468,6 @@ void name_mangle(char *OutName)
tu(OutName);
}
// Syslog('f',"name_mangle(%s) ==> [%s]", p, OutName);
free(p);
}

View File

@@ -4,7 +4,7 @@
* Purpose ...............: MBSE BBS functions for TURBODIESEL
*
*****************************************************************************
* Copyright (C) 1997-2002
* Copyright (C) 1997-2004
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10
@@ -182,7 +182,6 @@ char *ParseMacro( const char *line, int *dieselrc)
while (isspace(res[strlen(res) - 1])) {
res[strlen(res) - 1] = EOS;
}
// sprintf(&res[strlen(res)],"\r\n");
if ((res[0] == '@') && (res[1] =='!' ))
res[0]='\0';
return res;

View File

@@ -4,7 +4,7 @@
* Purpose ...............: BinkleyTerm outbound naming
*
*****************************************************************************
* Copyright (C) 1997-2003
* Copyright (C) 1997-2004
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10
@@ -138,7 +138,6 @@ char *pktname(faddr *addr, char flavor)
q = p + strlen(p);
sprintf(q, "%c%s", flavor, ptyp);
Syslog('O', "packet name is \"%s\"", p);
return p;
}
@@ -153,7 +152,6 @@ char *floname(faddr *addr, char flavor)
flavor = 'f';
q = p + strlen(p);
sprintf(q, "%c%s", flavor, ftyp);
Syslog('O', "flo file name is \"%s\"", p);
return p;
}
@@ -166,7 +164,6 @@ char *reqname(faddr *addr)
p = prepbuf(addr);
q = p + strlen(p);
sprintf(q, "%s", rtyp);
Syslog('O', "req file name is \"%s\"", p);
return p;
}
@@ -179,7 +176,6 @@ char *splname(faddr *addr)
p = prepbuf(addr);
q = p + strlen(p);
sprintf(q, "%s", styp);
Syslog('O', "spl file name is \"%s\"", p);
return p;
}
@@ -192,7 +188,6 @@ char *bsyname(faddr *addr)
p = prepbuf(addr);
q = p + strlen(p);
sprintf(q, "%s", btyp);
Syslog('O', "bsy file name is \"%s\"", p);
return p;
}
@@ -205,7 +200,6 @@ char *stsname(faddr *addr)
p = prepbuf(addr);
q = p + strlen(p);
sprintf(q, "%s", qtyp);
Syslog('O', "sts file name is \"%s\"", p);
return p;
}
@@ -218,7 +212,6 @@ char *polname(faddr *addr)
p = prepbuf(addr);
q = p + strlen(p);
sprintf(q, "%s", ltyp);
Syslog('O', "pol file name is \"%s\"", p);
return p;
}
@@ -286,7 +279,6 @@ char *arcname(faddr *addr, unsigned short Zone, int ARCmailCompat)
}
tidy_faddr(bestaka);
Syslog('O', "Arc file name is \"%s\"", buf);
return buf;
}

View File

@@ -4,7 +4,7 @@
* Purpose ...............: RFC msg
*
*****************************************************************************
* Copyright (C) 1997-2003
* Copyright (C) 1997-2004
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10
@@ -79,7 +79,6 @@ rfcmsg *parsrfc(FILE *fp)
} else
cur->val = xstrcat(cur->val,buffer);
} else {
// Syslog('M', "this is a header line");
if (cur) {
firstline=FALSE;
(cur->next) = (rfcmsg *)malloc(sizeof(rfcmsg));
@@ -101,7 +100,6 @@ rfcmsg *parsrfc(FILE *fp)
/* at least one non blank char */
(strspn(p+2, " \t\n") < strlen(p+2)) && (strspn(buffer,KWDCHARS) == (p-buffer))) {
*p='\0';
// Syslog('M', "This is a regular header");
cur->key = xstrcpy(buffer);
cur->val = xstrcpy(p+1);
} else if ((p=strchr(buffer,':')) && (!strncasecmp(buffer, (char *)"X-MS-", 5))) {
@@ -124,7 +122,6 @@ rfcmsg *parsrfc(FILE *fp)
cur->key = xstrcpy(buffer);
cur->val = xstrcpy((char *)" ");
} else {
Syslog('M', "Non-header line: \"%s\"",buffer);
cur->key = xstrcpy((char *)"X-Body-Start");
cur->val = xstrcpy(buffer);
break;

View File

@@ -4,7 +4,7 @@
* Purpose ...............: Security flags access test
*
*****************************************************************************
* Copyright (C) 1997-2003
* Copyright (C) 1997-2004
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10
@@ -40,9 +40,6 @@
*/
int Access(securityrec us, securityrec ref)
{
Syslog('B', "User %5d %08lx %08lx", us.level, us.flags, ~us.flags);
Syslog('B', "Ref. %5d %08lx %08lx", ref.level, ref.flags, ref.notflags);
if (us.level < ref.level)
return FALSE;
@@ -63,9 +60,6 @@ int Access(securityrec us, securityrec ref)
*/
int Le_Access(securityrec us, securityrec ref)
{
Syslog('B', "User %5d %08lx %08lx", us.level, us.flags, ~us.flags);
Syslog('B', "Ref. %5d %08lx %08lx", le_int(ref.level), ref.flags, ref.notflags);
if (us.level < le_int(ref.level))
return FALSE;