diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 80d53701ea..fce9a581ce 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,79 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-11-16 17:35 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/include/hbapierr.h + * harbour/src/rtl/errint.c + * harbour/src/rtl/errintlo.c + * harbour/src/lang/msghuiso.c + * harbour/src/lang/msgskiso.c + * harbour/src/lang/msgrukoi.c + * harbour/src/lang/msghuwin.c + * harbour/src/lang/msgzhgb.c + * harbour/src/lang/msgskwin.c + * harbour/src/lang/msg_tpl.c + * harbour/src/lang/msgruwin.c + * harbour/src/lang/msgelwin.c + * harbour/src/lang/msgro.c + * harbour/src/lang/msgpt.c + * harbour/src/lang/msghriso.c + * harbour/src/lang/msghrwin.c + * harbour/src/lang/msgsliso.c + * harbour/src/lang/msgbe866.c + * harbour/src/lang/msgslwin.c + * harbour/src/lang/msghe862.c + * harbour/src/lang/msgcskam.c + * harbour/src/lang/msggl.c + * harbour/src/lang/msgtrwin.c + * harbour/src/lang/msgbgiso.c + * harbour/src/lang/msgeo.c + * harbour/src/lang/msgskkam.c + * harbour/src/lang/msgbgwin.c + * harbour/src/lang/msges.c + * harbour/src/lang/msguakoi.c + * harbour/src/lang/msgzhb5.c + * harbour/src/lang/msgeu.c + * harbour/src/lang/msgpl852.c + * harbour/src/lang/msguados.c + * harbour/src/lang/msgsr852.c + * harbour/src/lang/msguawin.c + * harbour/src/lang/msgde.c + * harbour/src/lang/msgtr857.c + * harbour/src/lang/msgru866.c + * harbour/src/lang/msgcs852.c + * harbour/src/lang/msgfr.c + * harbour/src/lang/msgis850.c + * harbour/src/lang/msgnl.c + * harbour/src/lang/msghu852.c + * harbour/src/lang/msgsk852.c + * harbour/src/lang/msgplmaz.c + * harbour/src/lang/msgca.c + * harbour/src/lang/msgpliso.c + * harbour/src/lang/msgplwin.c + * harbour/src/lang/msgbgmik.c + * harbour/src/lang/msgid.c + * harbour/src/lang/msgbg866.c + * harbour/src/lang/msgltwin.c + * harbour/src/lang/msgptiso.c + * harbour/src/lang/msgsriso.c + * harbour/src/lang/msgel.c + * harbour/src/lang/msgsrwin.c + * harbour/src/lang/msgbewin.c + * harbour/src/lang/msgdewin.c + * harbour/src/lang/msghr437.c + * harbour/src/lang/msghr852.c + * harbour/src/lang/msgua866.c + * harbour/src/lang/msgko.c + * harbour/src/lang/msghewin.c + * harbour/src/lang/msgsl437.c + * harbour/src/lang/msgit.c + * harbour/src/lang/msgsl852.c + * harbour/src/lang/msghucwi.c + * harbour/src/lang/msgcsiso.c + * harbour/src/lang/msgcswin.c + * harbour/src/lang/msgeswin.c + * changed ULONG ulIntCode to HB_ERRCODE errCode in internal errors + 2009-11-16 17:14 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/hbnetio/netio.h * harbour/contrib/hbnetio/netiocli.c diff --git a/harbour/include/hbapierr.h b/harbour/include/hbapierr.h index d82264c61c..e607c615c2 100644 --- a/harbour/include/hbapierr.h +++ b/harbour/include/hbapierr.h @@ -167,8 +167,8 @@ extern HB_EXPORT USHORT hb_errRT_TERM ( HB_ERRCODE ulGenCode, HB_ERRCO extern HB_EXPORT USHORT hb_errRT_DBCMD ( HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation ); extern HB_EXPORT USHORT hb_errRT_DBCMD_Ext ( HB_ERRCODE ulGenCode, HB_ERRCODE ulSubCode, const char * szDescription, const char * szOperation, USHORT uiFlags ); -extern HB_EXPORT void hb_errInternal ( ULONG ulIntCode, const char * szText, const char * szPar1, const char * szPar2 ) HB_NORETURN_ATTR; -extern void hb_errInternalRaw ( ULONG ulIntCode, const char * szText, const char * szPar1, const char * szPar2 ); +extern HB_EXPORT void hb_errInternal ( HB_ERRCODE errCode, const char * szText, const char * szPar1, const char * szPar2 ) HB_NORETURN_ATTR; +extern void hb_errInternalRaw ( HB_ERRCODE errCode, const char * szText, const char * szPar1, const char * szPar2 ); /* Low-level error handling */ struct HB_ERROR_INFO_; /* forward declaration */ diff --git a/harbour/src/lang/msg_tpl.c b/harbour/src/lang/msg_tpl.c index 86bd5c7665..0956fa5566 100644 --- a/harbour/src/lang/msg_tpl.c +++ b/harbour/src/lang/msg_tpl.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgbe866.c b/harbour/src/lang/msgbe866.c index b002dd1a82..23a76a8add 100644 --- a/harbour/src/lang/msgbe866.c +++ b/harbour/src/lang/msgbe866.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - " 뫪 %lu: ", + " 뫪 %d: ", "뫪 i", " 맭砭 ERRORBLOCK() 뫪i", "ࠢ蠭 裂 i 몫i 몠 뫠", diff --git a/harbour/src/lang/msgbewin.c b/harbour/src/lang/msgbewin.c index 1a831d113b..b9dacfdee8 100644 --- a/harbour/src/lang/msgbewin.c +++ b/harbour/src/lang/msgbewin.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - " %lu: ", + " %d: ", " ", " ERRORBLOCK() ", " ", diff --git a/harbour/src/lang/msgbg866.c b/harbour/src/lang/msgbg866.c index 5d99e52323..15219e0db4 100644 --- a/harbour/src/lang/msgbg866.c +++ b/harbour/src/lang/msgbg866.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "ࠢ 誠 %lu: ", + "ࠢ 誠 %d: ", "ᯥ譮 ࠢﭥ 誠", "ﬠ ERRORBLOCK() 誠", "४ ४ᨢ 墠 誨", diff --git a/harbour/src/lang/msgbgiso.c b/harbour/src/lang/msgbgiso.c index c2c160774d..2c6066be8e 100644 --- a/harbour/src/lang/msgbgiso.c +++ b/harbour/src/lang/msgbgiso.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - " %lu: ", + " %d: ", " ", " ERRORBLOCK() ", " ", diff --git a/harbour/src/lang/msgbgmik.c b/harbour/src/lang/msgbgmik.c index ef57a2538b..1c7198f7c0 100644 --- a/harbour/src/lang/msgbgmik.c +++ b/harbour/src/lang/msgbgmik.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - " %lu: ", + " %d: ", " ", " ERRORBLOCK() ", " ", diff --git a/harbour/src/lang/msgbgwin.c b/harbour/src/lang/msgbgwin.c index 550a6052f2..331002e361 100644 --- a/harbour/src/lang/msgbgwin.c +++ b/harbour/src/lang/msgbgwin.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - " %lu: ", + " %d: ", " ", " ERRORBLOCK() ", " ", diff --git a/harbour/src/lang/msgca.c b/harbour/src/lang/msgca.c index d7096e3210..b91abd1429 100644 --- a/harbour/src/lang/msgca.c +++ b/harbour/src/lang/msgca.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgcs852.c b/harbour/src/lang/msgcs852.c index f50e3e4c06..4a9502ed2a 100644 --- a/harbour/src/lang/msgcs852.c +++ b/harbour/src/lang/msgcs852.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgcsiso.c b/harbour/src/lang/msgcsiso.c index 7adfadca49..bef79b3c84 100644 --- a/harbour/src/lang/msgcsiso.c +++ b/harbour/src/lang/msgcsiso.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgcskam.c b/harbour/src/lang/msgcskam.c index 0fa194521a..81ee064c68 100644 --- a/harbour/src/lang/msgcskam.c +++ b/harbour/src/lang/msgcskam.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgcswin.c b/harbour/src/lang/msgcswin.c index 13b84111ea..85efad24fc 100644 --- a/harbour/src/lang/msgcswin.c +++ b/harbour/src/lang/msgcswin.c @@ -166,7 +166,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgde.c b/harbour/src/lang/msgde.c index ecab2b4990..8b02e27409 100644 --- a/harbour/src/lang/msgde.c +++ b/harbour/src/lang/msgde.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgdewin.c b/harbour/src/lang/msgdewin.c index d80768dfd5..1ae8d8f74d 100644 --- a/harbour/src/lang/msgdewin.c +++ b/harbour/src/lang/msgdewin.c @@ -166,7 +166,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgel.c b/harbour/src/lang/msgel.c index 9392172148..217e768af4 100644 --- a/harbour/src/lang/msgel.c +++ b/harbour/src/lang/msgel.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgelwin.c b/harbour/src/lang/msgelwin.c index 70a185b6e2..b655caa479 100644 --- a/harbour/src/lang/msgelwin.c +++ b/harbour/src/lang/msgelwin.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - " %lu: ", + " %d: ", " ", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgeo.c b/harbour/src/lang/msgeo.c index 7d5b0cdc2e..7b50e971cf 100644 --- a/harbour/src/lang/msgeo.c +++ b/harbour/src/lang/msgeo.c @@ -167,7 +167,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msges.c b/harbour/src/lang/msges.c index 0075b70d31..8b70059d23 100644 --- a/harbour/src/lang/msges.c +++ b/harbour/src/lang/msges.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Error irrecuperable %lu: ", + "Error irrecuperable %d: ", "Fallo en recuperacin de error", "No hay ERRORBLOCK() para el error", "Demasiadas llamadas recursivas al controlador de errores", diff --git a/harbour/src/lang/msgeswin.c b/harbour/src/lang/msgeswin.c index 07206779d5..1cbe4fff3a 100644 --- a/harbour/src/lang/msgeswin.c +++ b/harbour/src/lang/msgeswin.c @@ -166,7 +166,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Error irrecuperable %lu: ", + "Error irrecuperable %d: ", "Fallo en recuperacin de error", "No hay ERRORBLOCK() para el error", "Demasiadas llamadas recursivas al controlador de errores", diff --git a/harbour/src/lang/msgeu.c b/harbour/src/lang/msgeu.c index a80ffed28a..d579db5176 100644 --- a/harbour/src/lang/msgeu.c +++ b/harbour/src/lang/msgeu.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgfr.c b/harbour/src/lang/msgfr.c index 96544830a9..b21cf53c73 100644 --- a/harbour/src/lang/msgfr.c +++ b/harbour/src/lang/msgfr.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msggl.c b/harbour/src/lang/msggl.c index d235af659f..b10aeb4c36 100644 --- a/harbour/src/lang/msggl.c +++ b/harbour/src/lang/msggl.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msghe862.c b/harbour/src/lang/msghe862.c index 4d21a4f484..c9e1aa1599 100644 --- a/harbour/src/lang/msghe862.c +++ b/harbour/src/lang/msghe862.c @@ -166,7 +166,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msghewin.c b/harbour/src/lang/msghewin.c index 0d670917d9..af93311ce8 100644 --- a/harbour/src/lang/msghewin.c +++ b/harbour/src/lang/msghewin.c @@ -166,7 +166,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msghr437.c b/harbour/src/lang/msghr437.c index 0b62772af1..46ed09d3b6 100644 --- a/harbour/src/lang/msghr437.c +++ b/harbour/src/lang/msghr437.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Nepopravljiva gre{ka %lu: ", + "Nepopravljiva gre{ka %d: ", "Gre{ka obnavljanje neuspje{no", "Nema ERRORBLOCK() za gre{ku", "Previ{e povratnih poziva upravlja~a gre{aka", diff --git a/harbour/src/lang/msghr852.c b/harbour/src/lang/msghr852.c index 6d6e0a1f1f..a9b42ea8db 100644 --- a/harbour/src/lang/msghr852.c +++ b/harbour/src/lang/msghr852.c @@ -166,7 +166,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msghriso.c b/harbour/src/lang/msghriso.c index 2a3f050abe..4310be5680 100644 --- a/harbour/src/lang/msghriso.c +++ b/harbour/src/lang/msghriso.c @@ -166,7 +166,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msghrwin.c b/harbour/src/lang/msghrwin.c index 50574086d5..bbc6934f99 100644 --- a/harbour/src/lang/msghrwin.c +++ b/harbour/src/lang/msghrwin.c @@ -167,7 +167,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Nepopravljiva greka %lu: ", + "Nepopravljiva greka %d: ", "Greka obnavljanje neuspjeno", "Nema ERRORBLOCK() za greku", "Previe povratnih poziva upravljaca greaka", diff --git a/harbour/src/lang/msghu852.c b/harbour/src/lang/msghu852.c index 97a05e2e5f..a6f7b14638 100644 --- a/harbour/src/lang/msghu852.c +++ b/harbour/src/lang/msghu852.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Kezelhetetlen hiba %lu: ", + "Kezelhetetlen hiba %d: ", "Hiba kezelsi hiba", "Nincs ERRORBLOCK() a hiba kezelshez", "Tl sok rekurzv hiba kezel hvs", diff --git a/harbour/src/lang/msghucwi.c b/harbour/src/lang/msghucwi.c index cf245986c3..ef0ccf0712 100644 --- a/harbour/src/lang/msghucwi.c +++ b/harbour/src/lang/msghucwi.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msghuiso.c b/harbour/src/lang/msghuiso.c index 586d049eed..4b986d820e 100644 --- a/harbour/src/lang/msghuiso.c +++ b/harbour/src/lang/msghuiso.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msghuwin.c b/harbour/src/lang/msghuwin.c index a3d356402e..561fce0ce5 100644 --- a/harbour/src/lang/msghuwin.c +++ b/harbour/src/lang/msghuwin.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgid.c b/harbour/src/lang/msgid.c index 114503dc3e..2d4a72e41c 100644 --- a/harbour/src/lang/msgid.c +++ b/harbour/src/lang/msgid.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgis850.c b/harbour/src/lang/msgis850.c index f09fddf517..8835a0d4ca 100644 --- a/harbour/src/lang/msgis850.c +++ b/harbour/src/lang/msgis850.c @@ -166,7 +166,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgit.c b/harbour/src/lang/msgit.c index 6317a70015..44b9bb3348 100644 --- a/harbour/src/lang/msgit.c +++ b/harbour/src/lang/msgit.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Errore irrecuperabile %lu: ", + "Errore irrecuperabile %d: ", "Recupero dell'errore non riuscito", "Manca ERRORBLOCK() per l'errore", "Troppe chiamate ricorsive al gestore d'errore", diff --git a/harbour/src/lang/msgko.c b/harbour/src/lang/msgko.c index 8782313400..4821508d13 100644 --- a/harbour/src/lang/msgko.c +++ b/harbour/src/lang/msgko.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgltwin.c b/harbour/src/lang/msgltwin.c index 08c8b96b00..881bf02981 100644 --- a/harbour/src/lang/msgltwin.c +++ b/harbour/src/lang/msgltwin.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgnl.c b/harbour/src/lang/msgnl.c index 1e83bc3d8b..58240f941b 100644 --- a/harbour/src/lang/msgnl.c +++ b/harbour/src/lang/msgnl.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Onherstelbare fout %lu: ", + "Onherstelbare fout %d: ", "Fout herstellen mislukt", "Geen ERRORBLOCK() voor fout", "Teveel herhalende fout behandelings aanroepen", diff --git a/harbour/src/lang/msgpl852.c b/harbour/src/lang/msgpl852.c index f3972a0057..41f9db8848 100644 --- a/harbour/src/lang/msgpl852.c +++ b/harbour/src/lang/msgpl852.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Nienaprawialny bd nr %lu: ", + "Nienaprawialny bd nr %d: ", "Nieudana prba naprawy bdu", "Brak kodu obsugi ERRORBLOCK()", "Zbyt wiele zagniedonych bdw", diff --git a/harbour/src/lang/msgpliso.c b/harbour/src/lang/msgpliso.c index 0bb94f352f..6f2fa389f5 100644 --- a/harbour/src/lang/msgpliso.c +++ b/harbour/src/lang/msgpliso.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Nienaprawialny bd nr %lu: ", + "Nienaprawialny bd nr %d: ", "Nieudana prba naprawy bdu", "Brak kodu obsugi ERRORBLOCK()", "Zbyt wiele zagniedonych bdw", diff --git a/harbour/src/lang/msgplmaz.c b/harbour/src/lang/msgplmaz.c index ee464e46b7..dfc3608b2b 100644 --- a/harbour/src/lang/msgplmaz.c +++ b/harbour/src/lang/msgplmaz.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Nienaprawialny bd nr %lu: ", + "Nienaprawialny bd nr %d: ", "Nieudana prba naprawy bdu", "Brak kodu obsugi ERRORBLOCK()", "Zbyt wiele zagniedonych bdw", diff --git a/harbour/src/lang/msgplwin.c b/harbour/src/lang/msgplwin.c index b3206fc4a9..45165d1db5 100644 --- a/harbour/src/lang/msgplwin.c +++ b/harbour/src/lang/msgplwin.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Nienaprawialny bd nr %lu: ", + "Nienaprawialny bd nr %d: ", "Nieudana prba naprawy bdu", "Brak kodu obsugi ERRORBLOCK()", "Zbyt wiele zagniedonych bdw", diff --git a/harbour/src/lang/msgpt.c b/harbour/src/lang/msgpt.c index d51b376e4d..7fdc49f5d9 100644 --- a/harbour/src/lang/msgpt.c +++ b/harbour/src/lang/msgpt.c @@ -177,7 +177,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Erro irrecupervel %lu: ", + "Erro irrecupervel %d: ", "Erro na recuperaao do erro", "ERRORBLOCK() para erro ausente", "Muitas chamadas recursivas ao manipulador de erros", diff --git a/harbour/src/lang/msgptiso.c b/harbour/src/lang/msgptiso.c index ef6d9149b9..7d6bcd25f0 100644 --- a/harbour/src/lang/msgptiso.c +++ b/harbour/src/lang/msgptiso.c @@ -177,7 +177,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Erro irrecupervel %lu: ", + "Erro irrecupervel %d: ", "Erro na recuperaao do erro", "ERRORBLOCK() para erro ausente", "Muitas chamadas recursivas ao manipulador de erros", diff --git a/harbour/src/lang/msgro.c b/harbour/src/lang/msgro.c index 539e605d69..f16d1f338e 100644 --- a/harbour/src/lang/msgro.c +++ b/harbour/src/lang/msgro.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgru866.c b/harbour/src/lang/msgru866.c index 2b5265e71e..c22182af4e 100644 --- a/harbour/src/lang/msgru866.c +++ b/harbour/src/lang/msgru866.c @@ -166,7 +166,7 @@ static HB_LANG s_lang = /* Internal error names */ - "ࠢ 訡 %lu: ", + "ࠢ 訡 %d: ", "訡 ⠭", " । ERRORBLOCK() 訡", "ॢ襭 । ४ᨢ 맮 ࠡ稪 訡", diff --git a/harbour/src/lang/msgrukoi.c b/harbour/src/lang/msgrukoi.c index 4663667dd0..da95a1b7b4 100644 --- a/harbour/src/lang/msgrukoi.c +++ b/harbour/src/lang/msgrukoi.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - " %lu: ", + " %d: ", " ", " ERRORBLOCK() ", " ", diff --git a/harbour/src/lang/msgruwin.c b/harbour/src/lang/msgruwin.c index b4180cd56c..585cdf58f1 100644 --- a/harbour/src/lang/msgruwin.c +++ b/harbour/src/lang/msgruwin.c @@ -166,7 +166,7 @@ static HB_LANG s_lang = /* Internal error names */ - " %lu: ", + " %d: ", " ", " ERRORBLOCK() ", " ", diff --git a/harbour/src/lang/msgsk852.c b/harbour/src/lang/msgsk852.c index 2038f19c53..1d829d15c7 100644 --- a/harbour/src/lang/msgsk852.c +++ b/harbour/src/lang/msgsk852.c @@ -164,7 +164,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgskiso.c b/harbour/src/lang/msgskiso.c index af13ffef0f..daf0e32e4b 100644 --- a/harbour/src/lang/msgskiso.c +++ b/harbour/src/lang/msgskiso.c @@ -164,7 +164,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgskkam.c b/harbour/src/lang/msgskkam.c index 7723cb2a0e..ea3c709a1d 100644 --- a/harbour/src/lang/msgskkam.c +++ b/harbour/src/lang/msgskkam.c @@ -164,7 +164,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgskwin.c b/harbour/src/lang/msgskwin.c index e327899c79..d13b8570c2 100644 --- a/harbour/src/lang/msgskwin.c +++ b/harbour/src/lang/msgskwin.c @@ -164,7 +164,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgsl437.c b/harbour/src/lang/msgsl437.c index 42e657a16f..64a1e2d008 100644 --- a/harbour/src/lang/msgsl437.c +++ b/harbour/src/lang/msgsl437.c @@ -166,7 +166,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgsl852.c b/harbour/src/lang/msgsl852.c index b302a243fb..1bd60d02c3 100644 --- a/harbour/src/lang/msgsl852.c +++ b/harbour/src/lang/msgsl852.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgsliso.c b/harbour/src/lang/msgsliso.c index 7569b978fc..35a708b7bc 100644 --- a/harbour/src/lang/msgsliso.c +++ b/harbour/src/lang/msgsliso.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgslwin.c b/harbour/src/lang/msgslwin.c index 28768f6331..11fa95339c 100644 --- a/harbour/src/lang/msgslwin.c +++ b/harbour/src/lang/msgslwin.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgsr852.c b/harbour/src/lang/msgsr852.c index 9e96d7b859..3dd4d4e6d0 100644 --- a/harbour/src/lang/msgsr852.c +++ b/harbour/src/lang/msgsr852.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgsriso.c b/harbour/src/lang/msgsriso.c index e80236b0bd..987e504096 100644 --- a/harbour/src/lang/msgsriso.c +++ b/harbour/src/lang/msgsriso.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgsrwin.c b/harbour/src/lang/msgsrwin.c index b1d7c02566..cf3ac4823b 100644 --- a/harbour/src/lang/msgsrwin.c +++ b/harbour/src/lang/msgsrwin.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - " %lu: ", + " %d: ", " ", " ERRORBLOCK() ", " ", diff --git a/harbour/src/lang/msgtr857.c b/harbour/src/lang/msgtr857.c index b6e49c4d20..c48d0a77ce 100644 --- a/harbour/src/lang/msgtr857.c +++ b/harbour/src/lang/msgtr857.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Kurtarlamaz hata%lu: ", + "Kurtarlamaz hata%d: ", "Hata kurtarma baarsz", "Hata iin ERRORBLOCK() yok", "ok fazla iie hata tutucu ars", diff --git a/harbour/src/lang/msgtrwin.c b/harbour/src/lang/msgtrwin.c index 71c5fb2902..a4dd34a675 100644 --- a/harbour/src/lang/msgtrwin.c +++ b/harbour/src/lang/msgtrwin.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Kurtarlamaz hata%lu: ", + "Kurtarlamaz hata%d: ", "Hata kurtarma baarsz", "Hata iin ERRORBLOCK() yok", "ok fazla iie hata tutucu ars", diff --git a/harbour/src/lang/msgua866.c b/harbour/src/lang/msgua866.c index 71948ac960..982fe2de17 100644 --- a/harbour/src/lang/msgua866.c +++ b/harbour/src/lang/msgua866.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "ࠢ %lu: ", + "ࠢ %d: ", " ", " 祭 ERRORBLOCK() ", "ॢ饭 ४ᨢ ஡ ", diff --git a/harbour/src/lang/msguados.c b/harbour/src/lang/msguados.c index e526ae7516..60abf49c7d 100644 --- a/harbour/src/lang/msguados.c +++ b/harbour/src/lang/msguados.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - "ࠢ %lu: ", + "ࠢ %d: ", " ", " 祭 ERRORBLOCK() ", "ॢ饭 ४ᨢ ஡ ", diff --git a/harbour/src/lang/msguakoi.c b/harbour/src/lang/msguakoi.c index c77128ee3a..0ea8638cd3 100644 --- a/harbour/src/lang/msguakoi.c +++ b/harbour/src/lang/msguakoi.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - " %lu: ", + " %d: ", " Ц צ", " ERRORBLOCK() ", " ˦ ", diff --git a/harbour/src/lang/msguawin.c b/harbour/src/lang/msguawin.c index 47584b2ebd..cc0b280cd7 100644 --- a/harbour/src/lang/msguawin.c +++ b/harbour/src/lang/msguawin.c @@ -165,7 +165,7 @@ static HB_LANG s_lang = /* Internal error names */ - " %lu: ", + " %d: ", " ", " ERRORBLOCK() ", " ", diff --git a/harbour/src/lang/msgzhb5.c b/harbour/src/lang/msgzhb5.c index 732661a4dd..54225b4443 100644 --- a/harbour/src/lang/msgzhb5.c +++ b/harbour/src/lang/msgzhb5.c @@ -166,7 +166,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/lang/msgzhgb.c b/harbour/src/lang/msgzhgb.c index 98697acd3d..203df65107 100644 --- a/harbour/src/lang/msgzhgb.c +++ b/harbour/src/lang/msgzhgb.c @@ -166,7 +166,7 @@ static HB_LANG s_lang = /* Internal error names */ - "Unrecoverable error %lu: ", + "Unrecoverable error %d: ", "Error recovery failure", "No ERRORBLOCK() for error", "Too many recursive error handler calls", diff --git a/harbour/src/rtl/errint.c b/harbour/src/rtl/errint.c index 76996f6173..5764313452 100644 --- a/harbour/src/rtl/errint.c +++ b/harbour/src/rtl/errint.c @@ -56,9 +56,9 @@ /* NOTE: Use as minimal calls from here, as possible. Don't allocate memory from this function. [vszakats] */ -void hb_errInternal( ULONG ulIntCode, const char * szText, const char * szPar1, const char * szPar2 ) +void hb_errInternal( HB_ERRCODE errCode, const char * szText, const char * szPar1, const char * szPar2 ) { - hb_errInternalRaw( ulIntCode, szText, szPar1, szPar2 ); + hb_errInternalRaw( errCode, szText, szPar1, szPar2 ); /* release console settings */ hb_conRelease(); diff --git a/harbour/src/rtl/errintlo.c b/harbour/src/rtl/errintlo.c index 2c320fc747..3d1abb81a9 100644 --- a/harbour/src/rtl/errintlo.c +++ b/harbour/src/rtl/errintlo.c @@ -60,7 +60,7 @@ /* NOTE: Use as minimal calls from here, as possible. Don't allocate memory from this function. [vszakats] */ -void hb_errInternalRaw( ULONG ulIntCode, const char * szText, const char * szPar1, const char * szPar2 ) +void hb_errInternalRaw( HB_ERRCODE errCode, const char * szText, const char * szPar1, const char * szPar2 ) { char buffer[ 8192 ]; char file[ HB_PATH_MAX ]; @@ -71,7 +71,7 @@ void hb_errInternalRaw( ULONG ulIntCode, const char * szText, const char * szPar FILE * hLog; - HB_TRACE(HB_TR_DEBUG, ("hb_errInternal(%lu, %s, %s, %s)", ulIntCode, szText, szPar1, szPar2)); + HB_TRACE(HB_TR_DEBUG, ("hb_errInternal(%d, %s, %s, %s)", errCode, szText, szPar1, szPar2)); if( szPar1 == NULL ) szPar1 = ""; @@ -104,16 +104,16 @@ void hb_errInternalRaw( ULONG ulIntCode, const char * szText, const char * szPar hb_conOutErr( hb_conNewLine(), 0 ); if( fLang ) - hb_snprintf( buffer, sizeof( buffer ), hb_langDGetItem( HB_LANG_ITEM_BASE_ERRINTR ), ulIntCode ); + hb_snprintf( buffer, sizeof( buffer ), hb_langDGetItem( HB_LANG_ITEM_BASE_ERRINTR ), errCode ); else - hb_snprintf( buffer, sizeof( buffer ), "Unrecoverable error %lu: ", ulIntCode ); + hb_snprintf( buffer, sizeof( buffer ), "Unrecoverable error %d: ", errCode ); hb_conOutErr( buffer, 0 ); if( hLog ) fprintf( hLog, "%s", buffer ); if( !szText && fLang ) - szText = hb_langDGetItem( HB_LANG_ITEM_BASE_ERRINTR + ulIntCode - 9000 ); + szText = hb_langDGetItem( HB_LANG_ITEM_BASE_ERRINTR + errCode - 9000 ); if( szText ) hb_snprintf( buffer, sizeof( buffer ), szText, szPar1, szPar2 );