Extract retcode from estruct.h. Clean up log dependencies.

This commit is contained in:
Renaud 2013-09-19 12:18:38 +08:00
parent 45ea35f2a7
commit c3bffda340
3 changed files with 60 additions and 74 deletions

112
Makefile
View File

@ -1,8 +1,8 @@
# makefile for emacs, updated Sat, Sep 14, 2013 12:02:10 PM
# makefile for emacs, updated Thu, Sep 19, 2013 12:14:27 PM
SRC=ansi.c basic.c bind.c bindable.c buffer.c crypt.c display.c ebind.c eval.c exec.c execute.c file.c fileio.c flook.c globals.c ibmpc.c input.c isearch.c line.c lock.c log.c main.c names.c pklock.c posix.c random.c region.c search.c spawn.c tcap.c termio.c utf8.c vmsvt.c vt52.c window.c word.c wrapper.c
OBJ=ansi.o basic.o bind.o bindable.o buffer.o crypt.o display.o ebind.o eval.o exec.o execute.o file.o fileio.o flook.o globals.o ibmpc.o input.o isearch.o line.o lock.o log.o main.o names.o pklock.o posix.o random.o region.o search.o spawn.o tcap.o termio.o utf8.o vmsvt.o vt52.o window.o word.o wrapper.o
HDR=basic.h bind.h bindable.h buffer.h crypt.h display.h ebind.h edef.h efunc.h estruct.h eval.h exec.h execute.h file.h fileio.h flook.h input.h isearch.h line.h lock.h log.h names.h pklock.h random.h region.h search.h spawn.h termio.h utf8.h version.h window.h word.h wrapper.h
HDR=basic.h bind.h bindable.h buffer.h crypt.h display.h ebind.h edef.h efunc.h estruct.h eval.h exec.h execute.h file.h fileio.h flook.h input.h isearch.h line.h lock.h log.h names.h pklock.h random.h region.h retcode.h search.h spawn.h termio.h utf8.h version.h window.h word.h wrapper.h
# DO NOT ADD OR MODIFY ANY LINES ABOVE THIS -- make source creates them
@ -126,65 +126,69 @@ depend: ${SRC}
# DO NOT DELETE THIS LINE -- make depend uses it
ansi.o: ansi.c estruct.h line.h utf8.h edef.h
basic.o: basic.c basic.h display.h estruct.h line.h utf8.h edef.h input.h \
random.h word.h
bind.o: bind.c bind.h edef.h estruct.h line.h utf8.h bindable.h buffer.h \
display.h ebind.h exec.h file.h flook.h input.h names.h window.h
ansi.o: ansi.c estruct.h line.h utf8.h retcode.h edef.h
basic.o: basic.c basic.h display.h estruct.h line.h utf8.h retcode.h \
edef.h input.h random.h word.h
bind.o: bind.c bind.h edef.h estruct.h line.h utf8.h retcode.h bindable.h \
buffer.h display.h ebind.h exec.h file.h flook.h input.h names.h \
window.h
bindable.o: bindable.c bindable.h buffer.h estruct.h line.h utf8.h \
display.h edef.h file.h input.h
buffer.o: buffer.c buffer.h estruct.h line.h utf8.h display.h edef.h \
file.h input.h window.h
crypt.o: crypt.c crypt.h estruct.h line.h utf8.h
display.o: display.c display.h estruct.h line.h utf8.h edef.h termio.h \
version.h wrapper.h window.h
retcode.h display.h edef.h file.h input.h
buffer.o: buffer.c buffer.h estruct.h line.h utf8.h retcode.h display.h \
edef.h file.h input.h window.h
crypt.o: crypt.c crypt.h estruct.h line.h utf8.h retcode.h
display.o: display.c display.h estruct.h line.h utf8.h retcode.h edef.h \
termio.h version.h wrapper.h window.h
ebind.o: ebind.c ebind.h basic.h bind.h edef.h estruct.h line.h utf8.h \
bindable.h buffer.h eval.h exec.h file.h isearch.h random.h region.h \
search.h spawn.h window.h word.h
eval.o: eval.c eval.h estruct.h line.h utf8.h basic.h bind.h edef.h \
buffer.h display.h exec.h flook.h input.h random.h search.h termio.h \
version.h window.h
exec.o: exec.c exec.h estruct.h line.h utf8.h buffer.h bind.h edef.h \
display.h eval.h file.h flook.h input.h
execute.o: execute.c edef.h estruct.h line.h utf8.h bind.h random.h \
display.h file.h
file.o: file.c file.h buffer.h estruct.h line.h utf8.h crypt.h edef.h \
execute.h fileio.h input.h lock.h log.h window.h
fileio.o: fileio.c fileio.h estruct.h line.h utf8.h crypt.h
flook.o: flook.c flook.h estruct.h line.h utf8.h fileio.h
globals.o: globals.c estruct.h line.h utf8.h edef.h
ibmpc.o: ibmpc.c estruct.h line.h utf8.h edef.h
input.o: input.c input.h edef.h estruct.h line.h utf8.h bind.h bindable.h \
display.h exec.h names.h wrapper.h
retcode.h bindable.h buffer.h eval.h exec.h file.h isearch.h random.h \
region.h search.h spawn.h window.h word.h
eval.o: eval.c eval.h estruct.h line.h utf8.h retcode.h basic.h bind.h \
edef.h buffer.h display.h exec.h flook.h input.h random.h search.h \
termio.h version.h window.h
exec.o: exec.c exec.h estruct.h line.h utf8.h retcode.h buffer.h bind.h \
edef.h display.h eval.h file.h flook.h input.h
execute.o: execute.c edef.h estruct.h line.h utf8.h retcode.h bind.h \
random.h display.h file.h
file.o: file.c file.h buffer.h estruct.h line.h utf8.h retcode.h crypt.h \
edef.h execute.h fileio.h input.h lock.h log.h window.h
fileio.o: fileio.c fileio.h estruct.h line.h utf8.h retcode.h crypt.h
flook.o: flook.c flook.h estruct.h line.h utf8.h retcode.h fileio.h
globals.o: globals.c estruct.h line.h utf8.h retcode.h edef.h
ibmpc.o: ibmpc.c estruct.h line.h utf8.h retcode.h edef.h
input.o: input.c input.h edef.h estruct.h line.h utf8.h retcode.h bind.h \
bindable.h display.h exec.h names.h wrapper.h
isearch.o: isearch.c isearch.h basic.h display.h estruct.h line.h utf8.h \
edef.h input.h search.h
line.o: line.c line.h utf8.h estruct.h edef.h log.h
lock.o: lock.c lock.h estruct.h line.h utf8.h display.h edef.h input.h
log.o: log.c log.h estruct.h line.h utf8.h
main.o: main.c basic.h bind.h edef.h estruct.h line.h utf8.h bindable.h \
buffer.h display.h eval.h execute.h file.h input.h lock.h log.h random.h \
search.h termio.h version.h
retcode.h edef.h input.h search.h
line.o: line.c line.h utf8.h estruct.h retcode.h edef.h log.h
lock.o: lock.c lock.h estruct.h line.h utf8.h retcode.h display.h edef.h \
input.h
log.o: log.c log.h retcode.h
main.o: main.c basic.h bind.h edef.h estruct.h line.h utf8.h retcode.h \
bindable.h buffer.h display.h eval.h execute.h file.h input.h lock.h \
log.h random.h search.h termio.h version.h
names.o: names.c names.h basic.h bind.h edef.h estruct.h line.h utf8.h \
bindable.h buffer.h display.h eval.h exec.h file.h isearch.h region.h \
random.h search.h spawn.h window.h word.h
pklock.o: pklock.c pklock.h estruct.h line.h utf8.h edef.h
retcode.h bindable.h buffer.h display.h eval.h exec.h file.h isearch.h \
region.h random.h search.h spawn.h window.h word.h
pklock.o: pklock.c pklock.h estruct.h line.h utf8.h retcode.h edef.h
posix.o: posix.c termio.h
random.o: random.c random.h basic.h display.h estruct.h line.h utf8.h \
edef.h execute.h input.h log.h search.h
region.o: region.c region.h estruct.h line.h utf8.h edef.h log.h
search.o: search.c search.h estruct.h line.h utf8.h basic.h display.h \
edef.h input.h log.h
spawn.o: spawn.c spawn.h buffer.h estruct.h line.h utf8.h display.h \
edef.h file.h input.h log.h window.h
tcap.o: tcap.c display.h estruct.h line.h utf8.h edef.h termio.h
termio.o: termio.c termio.h estruct.h line.h utf8.h edef.h
retcode.h edef.h execute.h input.h log.h search.h
region.o: region.c region.h estruct.h line.h utf8.h retcode.h edef.h \
log.h
search.o: search.c search.h estruct.h line.h utf8.h retcode.h basic.h \
display.h edef.h input.h log.h
spawn.o: spawn.c spawn.h buffer.h estruct.h line.h utf8.h retcode.h \
display.h edef.h file.h input.h log.h window.h
tcap.o: tcap.c display.h estruct.h line.h utf8.h retcode.h edef.h \
termio.h
termio.o: termio.c termio.h estruct.h line.h utf8.h retcode.h edef.h
utf8.o: utf8.c utf8.h
vmsvt.o: vmsvt.c estruct.h line.h utf8.h edef.h
vt52.o: vt52.c estruct.h line.h utf8.h edef.h
window.o: window.c window.h estruct.h line.h utf8.h basic.h display.h \
edef.h execute.h wrapper.h
word.o: word.c word.h basic.h estruct.h line.h utf8.h edef.h log.h \
random.h region.h
vmsvt.o: vmsvt.c estruct.h line.h utf8.h retcode.h edef.h
vt52.o: vt52.c estruct.h line.h utf8.h retcode.h edef.h
window.o: window.c window.h estruct.h line.h utf8.h retcode.h basic.h \
display.h edef.h execute.h wrapper.h
word.o: word.c word.h basic.h estruct.h line.h utf8.h retcode.h edef.h \
log.h random.h region.h
wrapper.o: wrapper.c wrapper.h
# DEPENDENCIES MUST END AT END OF FILE

View File

@ -249,25 +249,7 @@
#define CTLX 0x40000000 /* ^X flag, or'ed in */
#define SPEC 0x80000000 /* special key (function keys) */
#ifdef FALSE
#undef FALSE
#endif
#ifdef TRUE
#undef TRUE
#endif
#if 0
#define FALSE 0 /* False, no, bad, etc. */
#define TRUE 1 /* True, yes, good, etc. */
#define ABORT 2 /* Death, ^G, abort, etc. */
#define FAILED 3 /* not-quite fatal false return */
#endif
typedef enum {
FALSE,
TRUE
} boolean ;
#define ABORT 2
#include "retcode.h"
#define STOP 0 /* keyboard macro not in use */
#define PLAY 1 /* playing */

2
log.c
View File

@ -1,6 +1,6 @@
#include "log.h"
#include "estruct.h"
#include "retcode.h"
static void logdump( const char *buf, ...) {