Ignore:
Timestamp:
Apr 21, 2007, 8:33:35 AM (18 years ago)
Author:
bird
Message:

hacking...

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/ash-messup/error.h

    r632 r879  
    6262};
    6363
     64/*
    6465extern struct jmploc *handler;
    6566extern int exception;
    66 extern int exerrno;     /* error for EXEXEC */
     67extern int exerrno;*/   /* error for EXEXEC */
    6768
    6869/* exceptions */
     
    8081 */
    8182
    82 extern volatile int suppressint;
    83 extern volatile int intpending;
     83/*extern volatile int suppressint;
     84extern volatile int intpending;*/
    8485
    85 #define INTOFF suppressint++
    86 #define INTON { if (--suppressint == 0 && intpending) onint(); }
    87 #define FORCEINTON {suppressint = 0; if (intpending) onint();}
    88 #define CLEAR_PENDING_INT intpending = 0
    89 #define int_pending() intpending
     86#define INTOFF psh->suppressint++
     87#define INTON { if (--psh->suppressint == 0 && psh->intpending) onint(psh); }
     88#define FORCEINTON {suppressint = 0; if (psh->intpending) onint(psh);}
     89#define CLEAR_PENDING_INT psh->intpending = 0
     90#define int_pending() psh->intpending
    9091
    91 void exraise(int) __attribute__((__noreturn__));
    92 void onint(void);
    93 void error(const char *, ...) __attribute__((__noreturn__));
    94 void exerror(int, const char *, ...) __attribute__((__noreturn__));
    95 const char *errmsg(int, int);
     92void exraise(struct shinstance *, int) __attribute__((__noreturn__));
     93void onint(struct shinstance *);
     94void error(struct shinstance *, const char *, ...) __attribute__((__noreturn__));
     95void exerror(struct shinstance *, int, const char *, ...) __attribute__((__noreturn__));
     96const char *errmsg(struct shinstance *, int, int);
    9697
    97 void sh_err(int, const char *, ...) __attribute__((__noreturn__));
    98 void sh_verr(int, const char *, va_list) __attribute__((__noreturn__));
    99 void sh_errx(int, const char *, ...) __attribute__((__noreturn__));
    100 void sh_verrx(int, const char *, va_list) __attribute__((__noreturn__));
    101 void sh_warn(const char *, ...);
    102 void sh_vwarn(const char *, va_list);
    103 void sh_warnx(const char *, ...);
    104 void sh_vwarnx(const char *, va_list);
     98void sh_err(struct shinstance *, int, const char *, ...) __attribute__((__noreturn__));
     99void sh_verr(struct shinstance *, int, const char *, va_list) __attribute__((__noreturn__));
     100void sh_errx(struct shinstance *, int, const char *, ...) __attribute__((__noreturn__));
     101void sh_verrx(struct shinstance *, int, const char *, va_list) __attribute__((__noreturn__));
     102void sh_warn(struct shinstance *, const char *, ...);
     103void sh_vwarn(struct shinstance *, const char *, va_list);
     104void sh_warnx(struct shinstance *, const char *, ...);
     105void sh_vwarnx(struct shinstance *, const char *, va_list);
    105106
    106 void sh_exit(int) __attribute__((__noreturn__));
     107void sh_exit(struct shinstance *, int) __attribute__((__noreturn__));
    107108
    108109
Note: See TracChangeset for help on using the changeset viewer.