epilectrik
/
pyNgSpice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

remove some useless casts

rlar 15 years ago
parent
25a8ea2f44
commit
b93fcb3779
7 changed files with 36 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      ChangeLog
  2. 6
      src/frontend/help/readhelp.c
  3. 2
      src/frontend/outitf.c
  4. 28
      src/frontend/rawfile.c
  5. 9
      src/misc/dstring.c
  6. 2
      src/misc/hash.c
  7. 4
      src/ngsconvert.c

9
ChangeLog
View File

@ -1,3 +1,12 @@
2011-06-22 Robert Larice
* src/ngsconvert.c ,
* src/frontend/outitf.c ,
* src/frontend/rawfile.c ,
* src/frontend/help/readhelp.c ,
* src/misc/dstring.c ,
* src/misc/hash.c :
remove some useless casts
2011-06-22 Robert Larice
* src/spicelib/devices/bsim4/b4geo.c ,
* src/spicelib/devices/bsim4/b4noi.c ,

6
src/frontend/help/readhelp.c
View File

@ -255,7 +255,7 @@ findsubject(char *filename, char *subject)
}
/* try it exactly (but ignore case) */
while(fread((char *) &indexitem, sizeof (struct hlp_index), 1, fp)) {
while(fread(&indexitem, sizeof (struct hlp_index), 1, fp)) {
if (!strncasecmp(subject, indexitem.subject, 64)) { /* sjb - ignore case */
fclose(fp);
return(indexitem.fpos);
@ -270,7 +270,7 @@ findsubject(char *filename, char *subject)
}
/* try it abbreviated (ignore case) */
while(fread((char *) &indexitem, sizeof (struct hlp_index), 1, fp)) {
while(fread(&indexitem, sizeof (struct hlp_index), 1, fp)) {
if (!strncasecmp(indexitem.subject,subject, strlen(subject))) {
fclose(fp);
return(indexitem.fpos);
@ -285,7 +285,7 @@ findsubject(char *filename, char *subject)
}
/* try it within */ /* FIXME: need a case independent version of strstr() */
while(fread((char *) &indexitem, sizeof (struct hlp_index), 1, fp)) {
while(fread(&indexitem, sizeof (struct hlp_index), 1, fp)) {
if (strstr(indexitem.subject,subject)) {
fclose(fp);
return(indexitem.fpos);

2
src/frontend/outitf.c
View File

@ -892,7 +892,7 @@ fileEndPoint(FILE *fp, bool bin)
{
if (bin) {
/* write row buffer to file */
fwrite((char *)rowbuf, rowbuflen, 1, fp);
fwrite(rowbuf, rowbuflen, 1, fp);
}; /* otherwise the data has already been written */
return;
}

28
src/frontend/rawfile.c
View File

@ -203,32 +203,32 @@ raw_write(char *name, struct plot *pl, bool app, bool binary)
if (realflag) {
dd = (isreal(v) ? v->v_realdata[i] :
realpart(&v->v_compdata[i]));
(void) fwrite((char *) &dd, sizeof
(void) fwrite(&dd, sizeof
(double), 1, fp);
} else if (isreal(v)) {
dd = v->v_realdata[i];
(void) fwrite((char *) &dd, sizeof
(void) fwrite(&dd, sizeof
(double), 1, fp);
dd = 0.0;
(void) fwrite((char *) &dd, sizeof
(void) fwrite(&dd, sizeof
(double), 1, fp);
} else {
dd = realpart(&v->v_compdata[i]);
(void) fwrite((char *) &dd, sizeof
(void) fwrite(&dd, sizeof
(double), 1, fp);
dd = imagpart(&v->v_compdata[i]);
(void) fwrite((char *) &dd, sizeof
(void) fwrite(&dd, sizeof
(double), 1, fp);
}
} else if (raw_padding) {
dd = 0.0;
if (realflag) {
(void) fwrite((char *) &dd, sizeof
(void) fwrite(&dd, sizeof
(double), 1, fp);
} else {
(void) fwrite((char *) &dd, sizeof
(void) fwrite(&dd, sizeof
(double), 1, fp);
(void) fwrite((char *) &dd, sizeof
(void) fwrite(&dd, sizeof
(double), 1, fp);
}
}
@ -644,32 +644,32 @@ raw_read(char *name)
for (v = curpl->pl_dvecs; v; v = v->v_next) {
if (i < v->v_length) {
if (flags & VF_REAL) {
if (fread((char *) &v->v_realdata[i],
if (fread(&v->v_realdata[i],
sizeof (double), 1, fp) != 1)
fprintf(cp_err,
"Error: bad rawfile\n");
} else {
if (fread((char *) &v->v_compdata[i].cx_real,
if (fread(&v->v_compdata[i].cx_real,
sizeof (double), 1, fp) != 1)
fprintf(cp_err,
"Error: bad rawfile\n");
if (fread((char *) &v->v_compdata[i].cx_imag,
if (fread(&v->v_compdata[i].cx_imag,
sizeof (double), 1, fp) != 1)
fprintf(cp_err,
"Error: bad rawfile\n");
}
} else if (raw_padded) {
if (flags & VF_REAL) {
if (fread((char *) &junk,
if (fread(&junk,
sizeof (double), 1, fp) != 1)
fprintf(cp_err,
"Error: bad rawfile\n");
} else {
if (fread((char *) &junk,
if (fread(&junk,
sizeof (double), 1, fp) != 1)
fprintf(cp_err,
"Error: bad rawfile\n");
if (fread((char *) &junk,
if (fread(&junk,
sizeof (double), 1, fp) != 1)
fprintf(cp_err,
"Error: bad rawfile\n");

9
src/misc/dstring.c
View File

@ -4,7 +4,10 @@ DESCRIPTION:This file contains the routines for manipulating dynamic strings.
CONTENTS:
DATE: Wed Mar 24 18:38:28 CDT 2010
REVISIONS: $Log$
REVISIONS: Revision 1.6 2010-11-06 20:17:20 rlar
REVISIONS: Revision 1.7 2011-06-22 17:17:41 rlar
REVISIONS: remove some useless casts
REVISIONS:
REVISIONS: Revision 1.6 2010/11/06 20:17:20 rlar
REVISIONS: add `int' casts to some strlen() expressions, and center labels on a xlog scale
REVISIONS:
REVISIONS: Revision 1.5 2010/11/06 16:54:11 rlar
@ -100,7 +103,7 @@ char *spice_dstring_append(SPICE_DSTRINGPTR dsPtr,char *string,int length)
if (newSize >= dsPtr->spaceAvl) {
dsPtr->spaceAvl = 2 * newSize ;
newString = TMALLOC(char, dsPtr->spaceAvl) ;
memcpy((void *) newString, (void *) dsPtr->string, (size_t) dsPtr->length) ;
memcpy(newString, dsPtr->string, (size_t) dsPtr->length) ;
if (dsPtr->string != dsPtr->staticSpace) {
txfree(dsPtr->string) ;
}
@ -294,7 +297,7 @@ char *_spice_dstring_setlength(SPICE_DSTRINGPTR dsPtr,int length)
* to a larger buffer, since there may be embedded NULLs in the
* string in some cases.
----------------------------------------------------------------- */
memcpy((void *) newString, (void *) dsPtr->string, (size_t) dsPtr->length) ;
memcpy(newString, dsPtr->string, (size_t) dsPtr->length) ;
if( dsPtr->string != dsPtr->staticSpace ) {
txfree(dsPtr->string) ;
}

2
src/misc/hash.c
View File

@ -188,7 +188,7 @@ void nghash_empty(NGHASHPTR hashtable, void (*delete_data) (void *),
}
NGFREE( zapptr ) ;
}
memset( (char *)table, 0, (size_t) hashtable->size*sizeof(NGTABLEPTR)) ;
memset(table, 0, (size_t) hashtable->size*sizeof(NGTABLEPTR)) ;
}
/* free decks associated with tree if they exist */
hashtable->thread = NULL ; /* initialize list */

4
src/ngsconvert.c
View File

@ -37,12 +37,12 @@ char *cp_program = "sconvert";
char out_pbuf[BSIZE_SP];
#define tfread(ptr, siz, nit, fp) if (fread((char *) (ptr), (siz), \
#define tfread(ptr, siz, nit, fp) if (fread((ptr), (siz), \
(nit), (fp)) != (nit)) { \
fprintf(cp_err, "Error: unexpected EOF\n"); \
return (NULL); }
#define tfwrite(ptr, siz, nit, fp) if (fwrite((char *) (ptr), (siz), \
#define tfwrite(ptr, siz, nit, fp) if (fwrite((ptr), (siz), \
(nit), (fp)) != (nit)) { \
fprintf(cp_err, "Write error\n"); \
return; }

Write Preview
Loading…
Cancel
Save