luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed line-endings (DOS to UNIX) 

and translated German to English in comments.
This commit is contained in:
sjborley 2005-05-11 21:37:24 +00:00
parent 7e542d122a
commit 7376fa66e5
7 changed files with 476 additions and 482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontend/display.c
View File

@ -31,7 +31,7 @@ extern int X11_Init(void), X11_NewViewport(GRAPH *graph), X11_Close(void), X11_
#endif #endif
#ifdef HAS_WINDOWS /* Grafik-IO über MS Windows */ #ifdef HAS_WINDOWS /* Graphic-IO under MS Windows */
extern int WIN_Init(), WIN_NewViewport(), WIN_Close(), WIN_Clear(), extern int WIN_Init(), WIN_NewViewport(), WIN_Close(), WIN_Clear(),
WIN_DrawLine(), WIN_Arc(), WIN_Text(), WIN_DefineColor(), WIN_DrawLine(), WIN_Arc(), WIN_Text(), WIN_DefineColor(),
WIN_DefineLinestyle(), WIN_SetLinestyle(), WIN_SetColor(), WIN_DefineLinestyle(), WIN_SetLinestyle(), WIN_SetColor(),
@ -78,7 +78,7 @@ DISPDEVICE device[] = {
gen_DatatoScreen,}, gen_DatatoScreen,},
#endif #endif
#ifdef HAS_WINDOWS /* Grafik-IO über MS Windows */ #ifdef HAS_WINDOWS /* Graphic-IO under MS Windows */
{"Windows", 0, 0, 1000, 1000, 0, 0, WIN_Init, WIN_NewViewport, {"Windows", 0, 0, 1000, 1000, 0, 0, WIN_Init, WIN_NewViewport,
WIN_Close, WIN_Clear, WIN_Close, WIN_Clear,
WIN_DrawLine, WIN_Arc, WIN_Text, WIN_DefineColor, WIN_DefineLinestyle, WIN_DrawLine, WIN_Arc, WIN_Text, WIN_DefineColor, WIN_DefineLinestyle,
@ -86,7 +86,7 @@ DISPDEVICE device[] = {
nodev, nodev, nodev, gen_Input, nodev, nodev, nodev, gen_Input,
gen_DatatoScreen, WIN_DiagramReady}, gen_DatatoScreen, WIN_DiagramReady},
// Achtung: Namen "WinPrint" nicht ändern! // Warning: name "WinPrint" do not change!
{"WinPrint", 0, 0, 1000, 1000, 0, 0, WPRINT_Init, WPRINT_NewViewport, {"WinPrint", 0, 0, 1000, 1000, 0, 0, WPRINT_Init, WPRINT_NewViewport,
WPRINT_Close, WPRINT_Clear, WPRINT_Close, WPRINT_Clear,
WPRINT_DrawLine, WPRINT_Arc, WPRINT_Text, WPRINT_DefineColor, WPRINT_DefineLinestyle, WPRINT_DrawLine, WPRINT_Arc, WPRINT_Text, WPRINT_DefineColor, WPRINT_DefineLinestyle,
@ -128,7 +128,6 @@ DISPDEVICE device[] = {
}; };
DISPDEVICE *dispdev = device + NUMELEMS(device) - 1; DISPDEVICE *dispdev = device + NUMELEMS(device) - 1;
// DISPDEVICE *dispdev = device ; /* GCC257 stuertzt hier ab */
#define XtNumber(arr) (sizeof(arr) / sizeof(arr[0])) #define XtNumber(arr) (sizeof(arr) / sizeof(arr[0]))

2
src/frontend/hpgl.c
View File

@ -28,8 +28,6 @@ Author: Jim Groves
*/ */
#include "ngspice.h" #include "ngspice.h"
#include "cpdefs.h" #include "cpdefs.h"
#include "graph.h" #include "graph.h"

11
src/frontend/rawfile.c
View File

@ -4,7 +4,6 @@ Author: 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
**********/ **********/
/* /*
*
* Read and write the ascii and binary rawfile formats. * Read and write the ascii and binary rawfile formats.
*/ */
@ -63,7 +62,7 @@ raw_write(char *name, struct plot *pl, bool app, bool binary)
prec = DEFPREC; prec = DEFPREC;
#ifdef __MINGW32__ #ifdef __MINGW32__
// -Binärdatei binär schreiben- hvogt 15.03.2000 --------------------- /* - Binary file binary write - hvogt 15.03.2000 ---------------------*/
if (binary) { if (binary) {
if (!(fp = fopen(name, app ? "ab" : "wb"))) { if (!(fp = fopen(name, app ? "ab" : "wb"))) {
perror(name); perror(name);
@ -78,7 +77,7 @@ raw_write(char *name, struct plot *pl, bool app, bool binary)
} }
fprintf(cp_out,"ASCII raw file\n"); fprintf(cp_out,"ASCII raw file\n");
} }
// -------------------------------------------------------------------- /* --------------------------------------------------------------------*/
#else #else
@ -294,11 +293,11 @@ raw_read(char *name)
} }
#ifdef __MINGW32__ #ifdef __MINGW32__
// Test, ob Datei wirklich ASCII, sonst binär annehmen hvogt 15.3.2000 /* Test, whether file really ASCII, otherwise assume binary hvogt 15.3.2000 */
while (fgets(buf, BSIZE_SP, fp)) { while (fgets(buf, BSIZE_SP, fp)) {
if (ciprefix("values:", buf)) { if (ciprefix("values:", buf)) {
binary = FALSE; binary = FALSE;
rewind(fp); // zurückspulen rewind(fp); /* rewind */
fprintf(cp_err, "\nASCII raw file\n"); fprintf(cp_err, "\nASCII raw file\n");
break; break;
} }
@ -312,7 +311,7 @@ raw_read(char *name)
} }
fprintf(cp_err, "\nbinary raw file\n"); fprintf(cp_err, "\nbinary raw file\n");
} }
//-------------------------------------------------------- /*--------------------------------------------------------*/
#endif #endif
/* Since we call cp_evloop() from here, we have to do this junk. */ /* Since we call cp_evloop() from here, we have to do this junk. */

42
src/include/wstdio.h
View File

@ -1,21 +1,21 @@
/* I/O Redirection für Spice 3F4 unter Win32s /* I/O Redirection for Spice 3F4 under Win32s
Autor: Wolfgang Mües Autor: Wolfgang Muees
Stand: 21.05.95 Stand: 21.05.95
*/ */
#ifndef W_STDIO_H #ifndef WSTDIO_H
#define W_STDIO_H #define WSTDIO_H
#include <stdio.h> // originale Definitionen #include <stdio.h> /* original definitions */
#undef getc(f) // alte macros zurücknehmen
#undef putc(c,f)
#undef ungetc(c,f)
#undef getchar()
#undef putchar(c)
#undef feof(f)
#undef ferror(f)
#undef getc /* old macros removed */
#undef putc
#undef ungetc
#undef getchar
#undef putchar
#undef feof
#undef ferror
// -------------------------------<forwards>----------------------------------- /* -------------------------------<forwards>----------------------------------*/
int f_c_l_o_s_e( FILE * __stream); int f_c_l_o_s_e( FILE * __stream);
int f_f_l_u_s_h( FILE * __stream); int f_f_l_u_s_h( FILE * __stream);
@ -39,9 +39,9 @@ int p_u_t_s(const char * __s);
int s_c_a_n_f(const char * __format, ...); int s_c_a_n_f(const char * __format, ...);
int ung_e_t_c(int __c, FILE * __stream); int ung_e_t_c(int __c, FILE * __stream);
int vfp_r_i_n_t_f(FILE * __stream, const char * __format, void * __arglist); int vfp_r_i_n_t_f(FILE * __stream, const char * __format, void * __arglist);
//int vfs_c_a_n_f(FILE * __stream, const char * __format, void * __arglist); /*int vfs_c_a_n_f(FILE * __stream, const char * __format, void * __arglist);*/
int vp_r_i_n_t_f(const char * __format, void * __arglist); int vp_r_i_n_t_f(const char * __format, void * __arglist);
//int vs_c_a_n_f(const char * __format, void * __arglist); /*int vs_c_a_n_f(const char * __format, void * __arglist); */
int r_e_a_d(int fd, char * __buf, int __n); int r_e_a_d(int fd, char * __buf, int __n);
int g_e_t_c(FILE * __fp); int g_e_t_c(FILE * __fp);
int g_e_t_char(void); int g_e_t_char(void);
@ -52,7 +52,7 @@ int f_e_r_r_o_r(FILE * __fp);
int fg_e_t_char(void); int fg_e_t_char(void);
int fp_u_t_char(int __c); int fp_u_t_char(int __c);
// ------------------------------<neue macros>--------------------------------- /* ------------------------------<New macros>---------------------------------*/
#define fclose f_c_l_o_s_e #define fclose f_c_l_o_s_e
#define fflush f_f_l_u_s_h #define fflush f_f_l_u_s_h
@ -76,9 +76,9 @@ int fp_u_t_char(int __c);
#define scanf s_c_a_n_f #define scanf s_c_a_n_f
#define ungetc ung_e_t_c #define ungetc ung_e_t_c
#define vfprintf vfp_r_i_n_t_f #define vfprintf vfp_r_i_n_t_f
//#define vfscanf vfs_c_a_n_f /*#define vfscanf vfs_c_a_n_f*/
#define vprintf vp_r_i_n_t_f #define vprintf vp_r_i_n_t_f
//#define vscanf vs_c_a_n_f /*#define vscanf vs_c_a_n_f*/
#define read r_e_a_d #define read r_e_a_d
#define getc g_e_t_c #define getc g_e_t_c
#define getchar g_e_t_char #define getchar g_e_t_char
@ -89,9 +89,7 @@ int fp_u_t_char(int __c);
#define fgetchar fg_e_t_char #define fgetchar fg_e_t_char
#define fputchar fp_u_t_char #define fputchar fp_u_t_char
// ---------------------------------------------------------------------------- /*----------------------------------------------------------------------------*/
// #include "io_special.h" #endif /* WSTDIO_H */
#endif /* W_STDIO_H */

2
src/spicelib/analysis/acan.c
View File

@ -303,7 +303,7 @@ ACan(CKTcircuit *ckt, int restart)
case DECADE: case DECADE:
case OCTAVE: case OCTAVE:
// neu eingefügt 14.12.2001 /* inserted again 14.12.2001 */
#ifdef HAS_WINDOWS #ifdef HAS_WINDOWS
{ {
double endfreq = ((ACAN*)ckt->CKTcurJob)->ACstopFreq; double endfreq = ((ACAN*)ckt->CKTcurJob)->ACstopFreq;