Should check if the code compiles before committing...

2 files changed, 64 insertions, 64 deletions

diff --git a/lib/String.cc b/lib/String.cc
index bcea5d2..c4fbaf9 100644
--- a/lib/String.cc
+++ b/lib/String.cc
@@ -159,7 +159,7 @@ const char * String::set(const ugly_string & s, ...) {
     return t;
 }
 
-int String::scanf(const char * s, ...) {
+int String::scanf(const char * s, ...) const {
     va_list ap;
     int t;
 
@@ -169,7 +169,7 @@ int String::scanf(const char * s, ...) {
     return t;
 }
 
-int String::scanf(const ugly_string & s, ...) {
+int String::scanf(const ugly_string & s, ...) const {
     va_list ap;
     int t;
 
@@ -209,7 +209,7 @@ String String::extract(size_t from, ssize_t to) const {
 }
 
 char * String::strdup(size_t from, ssize_t to) const {
-    return Base::strdup(extract(from, to));
+    return Base::strdup(extract(from, to).str);
 }
 
 int String::to_int(void) const {
diff --git a/po/fr.po b/po/fr.po
index b387c4d..8052831 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Baltisot 1.0.0\n"
-"POT-Creation-Date: 2002-12-07 03:03+0100\n"
+"POT-Creation-Date: 2002-01-08 10:14+0100\n"
 "PO-Revision-Date: 2001-10-29 08:26GMT\n"
 "Last-Translator: Nicolas Noble <nicolas@nobis-crew.org>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -14,180 +14,180 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: lib/CopyJob.cc:70
+#: lib/CopyJob.cc:68
 msgid "CopyJob from "
 msgstr "CopyJob depuis "
 
-#: lib/CopyJob.cc:70 lib/ReadJob.cc:51
+#: lib/CopyJob.cc:68 lib/ReadJob.cc:48
 msgid " to "
 msgstr " vers "
 
-#: lib/Exceptions.cc:24 lib/Exceptions.cc:29 lib/Exceptions.cc:34
+#: lib/Exceptions.cc:15 lib/Exceptions.cc:20 lib/Exceptions.cc:25
 msgid "Generating a General Exception error: '"
 msgstr "Génération d'une Exception Générale: '"
 
-#: lib/Exceptions.cc:49
-#, c-format
-msgid "Failed allocating %u bytes."
+#: lib/Exceptions.cc:38
+#, fuzzy, c-format
+msgid "Failed allocating %ld bytes."
 msgstr "N'a pu allouer %u octets."
 
-#: lib/Exceptions.cc:54
-#, c-format
-msgid "An error has occured while %s %u bytes on %s: %s"
+#: lib/Exceptions.cc:43
+#, fuzzy, c-format
+msgid "An error has occured while %s %ld bytes on %s: %s"
 msgstr "Une erreur est survenue en %s %u octets depuis %s: %s"
 
-#: lib/Exceptions.cc:54
+#: lib/Exceptions.cc:43
 msgid "writing"
 msgstr "écrivant"
 
-#: lib/Exceptions.cc:54
+#: lib/Exceptions.cc:43
 msgid "reading"
 msgstr "lisant"
 
-#: lib/Exceptions.cc:63
+#: lib/Exceptions.cc:52
 msgid "No more bytes for reading or writing."
 msgstr "Plus d'octets à lire ou écrire"
 
-#: lib/Exceptions.cc:69
+#: lib/Exceptions.cc:58
 msgid "Switching task in a non-tasked environnement"
 msgstr "Basculement de tâche dans un environnement non multi-tâches"
 
-#: lib/Exceptions.cc:75
-msgid "Exitting with code "
-msgstr "Sortie avec le code "
-
-#: lib/Exceptions.cc:142
+#: lib/Exceptions.cc:123
 msgid "Error creating pipe: "
 msgstr "Erreur en créant un tube: "
 
-#: lib/Exceptions.cc:154
+#: lib/Exceptions.cc:135
 msgid "Was not able to fork().\n"
 msgstr "N'a pu faire de fork().\n"
 
-#: lib/Handle.cc:163 lib/Handle.cc:171
+#: lib/Handle.cc:154 lib/Handle.cc:162
 msgid "Error during close: "
 msgstr "Erreur pendant close: "
 
-#: lib/Handle.cc:165
+#: lib/Handle.cc:156
 msgid "Error in zlib during gzclose."
 msgstr "Erreur dans la zlib pendant gzclose."
 
-#: lib/Handle.cc:190
+#: lib/Handle.cc:181
 msgid "Bare Handle - should not happend"
 msgstr "Handle pur - ne devrait pas arriver"
 
-#: lib/Handle.cc:214
+#: lib/Handle.cc:205
 msgid "Can't SetZ a Handle twice."
 msgstr "Ne peut faire SetZ sur un Handle deux fois."
 
-#: lib/Handle.cc:217
+#: lib/Handle.cc:208
 msgid "Can't SetZ a virtual Handle."
 msgstr "Ne peut SetZ sur un Handle virtuel."
 
-#: lib/Handle.cc:232
+#: lib/Handle.cc:223
 msgid "Was not able to gzdopen."
 msgstr "N'a pu faire de gzdopen."
 
-#: lib/Handle.cc:253
+#: lib/Handle.cc:239
 msgid "Error in zlib during gzwrite: "
 msgstr "Erreur dans la zlib pendant gzwrite: "
 
-#: lib/Input.cc:24 lib/Output.cc:23
+#: lib/Input.cc:16 lib/Output.cc:16
 msgid "Error opening file "
 msgstr "Erreur en ouvrant le fichier "
 
-#: lib/Input.cc:24
+#: lib/Input.cc:16
 msgid " for reading: "
 msgstr " en lecture: "
 
-#: lib/Input.cc:70 lib/Input.cc:74 lib/Output.cc:57 lib/Output.cc:61
-msgid "Error seeking file "
-msgstr "Erreur en avançant dans le fichier"
-
-#: lib/Input.cc:70 lib/Output.cc:57
-msgid ": "
-msgstr ": "
-
-#: lib/Input.cc:74 lib/Output.cc:61
-msgid ": the position does not match"
-msgstr ": la position ne correspond pas"
-
-#: lib/Output.cc:23
+#: lib/Output.cc:16
 msgid " for writing: "
 msgstr " en écriture: "
 
-#: lib/ReadJob.cc:51
+#: lib/ReadJob.cc:48
 msgid "ReadJob from "
 msgstr "ReadJob depuis "
 
-#: lib/Regex.cc:15
+#: lib/Regex.cc:12
 msgid "Error in regcomp:"
 msgstr "Erreur dans regcomp:"
 
-#: lib/Regex.cc:18 lib/Regex.cc:29
+#: lib/Regex.cc:15 lib/Regex.cc:26
 msgid "Regex \""
 msgstr "Regex \""
 
-#: lib/Regex.cc:18 lib/Regex.cc:29
+#: lib/Regex.cc:15 lib/Regex.cc:26
 msgid "\" failed to compile: "
 msgstr "\" n'a pu compiler: "
 
-#: lib/Socket.cc:22
+#: lib/Socket.cc:18
 msgid "Error creating socket."
 msgstr "Erreur en créeant un socket."
 
-#: lib/Socket.cc:144
+#: lib/Socket.cc:133
 msgid "Failed accepting."
 msgstr "N'a pu accepter."
 
-#: lib/Task.cc:31 lib/Task.cc:47
+#: lib/Task.cc:28 lib/Task.cc:44
 msgid "Task "
 msgstr "La tache "
 
-#: lib/Task.cc:31
+#: lib/Task.cc:28
 msgid " caused an unexpected exception: \""
 msgstr " a causée une exception innatendue: \""
 
-#: lib/Task.cc:31 lib/Task.cc:47
+#: lib/Task.cc:28 lib/Task.cc:44
 msgid "\". Terminating.\n"
 msgstr "\". Terminaison.\n"
 
-#: lib/Task.cc:47
+#: lib/Task.cc:44
 msgid " caused an unexpected exception during dry-run: \""
 msgstr " a causée une exception innatendue pendant l'exécution rapide: \""
 
-#: lib/Task.cc:60
+#: lib/Task.cc:57
 msgid "Unknow Task"
 msgstr "Tache inconnue"
 
-#: lib/TaskMan.cc:72
+#: lib/TaskMan.cc:68
 msgid "Task Manager already initialised."
 msgstr "Le gestionnaire de tache est déjà initialisé."
 
-#: lib/TaskMan.cc:222
+#: lib/TaskMan.cc:205
 msgid "TaskMan: No more task to manage."
 msgstr "Plus de taches à gérer."
 
-#: lib/TaskMan.cc:328
+#: lib/TaskMan.cc:316
 msgid "Error during poll: "
 msgstr "Erreur pendant poll: "
 
-#: lib/TaskMan.cc:340
+#: lib/TaskMan.cc:329
 msgid "Error with poll, handle "
 msgstr "Erreur avec poll, handle "
 
-#: lib/TaskMan.cc:340
+#: lib/TaskMan.cc:329
 msgid " invalid."
 msgstr " invalide."
 
-#: lib/InPipe.cc:41
+#: lib/TaskMan.cc:414
+msgid "TaskMan: internal error (task not found) -- SHOULD NOT HAPPEN!!"
+msgstr ""
+
+#: lib/InPipe.cc:32
 msgid "Input pipe from stdout ("
 msgstr "Tube d'entrée depuis stdout ("
 
-#: lib/InPipe.cc:41 lib/OutPipe.cc:40
+#: lib/InPipe.cc:32 lib/OutPipe.cc:32
 msgid "not "
 msgstr "non "
 
-#: lib/InPipe.cc:41 lib/OutPipe.cc:40
+#: lib/InPipe.cc:32 lib/OutPipe.cc:32
 msgid "hooked)"
 msgstr "détourné)"
+
+#~ msgid "Exitting with code "
+#~ msgstr "Sortie avec le code "
+
+#~ msgid "Error seeking file "
+#~ msgstr "Erreur en avançant dans le fichier"
+
+#~ msgid ": "
+#~ msgstr ": "
+
+#~ msgid ": the position does not match"
+#~ msgstr ": la position ne correspond pas"