Err.cpp (pymol-v1.8.6.0.tar.bz2) | : | Err.cpp (pymol-v2.1.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 33 | skipping to change at line 33 | |||
void ErrFatal(const PyMOLGlobals *, const char *where, const char *what) | void ErrFatal(const PyMOLGlobals *, const char *where, const char *what) | |||
{ | { | |||
fprintf(stderr, "%s-Error: %s\n", where, what); | fprintf(stderr, "%s-Error: %s\n", where, what); | |||
fflush(stderr); | fflush(stderr); | |||
exit(1); | exit(1); | |||
} | } | |||
int ErrMessage(PyMOLGlobals * G, const char *where, const char *what) | int ErrMessage(PyMOLGlobals * G, const char *where, const char *what) | |||
{ | { | |||
char buffer[1024]; | ||||
if(Feedback(G, FB_Executive, FB_Errors)) { | ||||
/* unclassified errors are assigned to the Executive catch-all */ | /* unclassified errors are assigned to the Executive catch-all */ | |||
sprintf(buffer, "%s-Error: %s\n", where, what); | PRINTFB(G, FB_Executive, FB_Errors) | |||
OrthoAddOutput(G, buffer); | "%s-Error: %s\n", where, what | |||
OrthoRestorePrompt(G); | ENDFB(G); | |||
} | ||||
return (0); | return (0); | |||
} | } | |||
void ErrPointer(const PyMOLGlobals *, const char *file, int line) | void ErrPointer(const PyMOLGlobals *, const char *file, int line) | |||
{ | { | |||
fprintf(stderr, "NULL-POINTER-ERROR: in %s line %i\n", file, line); | fprintf(stderr, "NULL-POINTER-ERROR: in %s line %i\n", file, line); | |||
printf | printf | |||
("************************************************************************** **\n"); | ("************************************************************************** **\n"); | |||
printf | printf | |||
("*** EEK! PyMOL just ran out of memory and crashed. To get around this, * **\n"); | ("*** EEK! PyMOL just ran out of memory and crashed. To get around this, * **\n"); | |||
End of changes. 2 change blocks. | ||||
7 lines changed or deleted | 3 lines changed or added |