diff options
| -rw-r--r-- | doc/API | 6 | ||||
| -rw-r--r-- | include/BLua.h | 6 | ||||
| -rw-r--r-- | lib/Action.cc | 2 | ||||
| -rw-r--r-- | lib/HttpServ.cc | 4 | ||||
| -rw-r--r-- | lib/Variables.cc | 1 |
5 files changed, 9 insertions, 10 deletions
@@ -383,10 +383,10 @@ directory into a .paq file. Here is how you use it: First you create a variable of type "Archive", like this: -new Archive("datas.paq"); +new Archive("data.paq"); -This one will "register" the archive named "datas.paq". So, after that, if you -create an Input handle, it will first look into the archive datas.paq to see +This one will "register" the archive named "data.paq". So, after that, if you +create an Input handle, it will first look into the archive data.paq to see if your file is not in. It will only do so if the file path is relative (ie not begining with '/' or with '?:\' (for windows...)) If your file is found in the archive, it will be read directly and transparantly. Otherwise, diff --git a/include/BLua.h b/include/BLua.h index 9fa4248..aeebbf0 100644 --- a/include/BLua.h +++ b/include/BLua.h @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: BLua.h,v 1.28 2006-02-09 17:08:24 pixel Exp $ */ +/* $Id: BLua.h,v 1.29 2007-02-07 00:31:10 pixel Exp $ */ #ifndef __BLUA_H__ #define __BLUA_H__ @@ -220,7 +220,7 @@ struct lua_functypes_t { int i = 0; \ while (classname##_methods[i].number != -1) { \ if (i != classname##_methods[i].number) { \ - throw GeneralException("Datas of " #classname "_methods inconsistants!"); \ + throw GeneralException("Data of " #classname "_methods inconsistants!"); \ } \ i++; \ } \ @@ -230,7 +230,7 @@ struct lua_functypes_t { int i = 0; \ while (classname##_functions[i].number != -1) { \ if (i != classname##_functions[i].number) { \ - throw GeneralException("Datas of " #classname "_functions inconsistants!"); \ + throw GeneralException("Data of " #classname "_functions inconsistants!"); \ } \ i++; \ } \ diff --git a/lib/Action.cc b/lib/Action.cc index e5825b9..23f96d0 100644 --- a/lib/Action.cc +++ b/lib/Action.cc @@ -52,7 +52,7 @@ Action * Action::Look4URL(const String & URL) { } /* - * Voici la skin principale. Elle nécessite un fichier 'grain.png' dans le répertoire datas + * Voici la skin principale. Elle nécessite un fichier 'grain.png' dans le répertoire data * et un fichier 'style.css' (fournis) */ diff --git a/lib/HttpServ.cc b/lib/HttpServ.cc index a4101a7..a923c83 100644 --- a/lib/HttpServ.cc +++ b/lib/HttpServ.cc @@ -165,11 +165,11 @@ int ProcessRequest::Do() throw(GeneralException) { ShowError(&b); } } else { - // Dans tous les autres cas de domaine, on cherche le fichier dans le répertoire datas. + // Dans tous les autres cas de domaine, on cherche le fichier dans le répertoire data. // On utilise try au cas où le fichier n'existe pas et donc que le constructeur // d'input renvoie une erreur. try { - Handle * i = new Input(String("datas/") + file); + Handle * i = new Input(String("data/") + file); SendHeads(&b, GetMime(file), String("Accept-Ranges: bytes") + endhl + "Content-Length: " + (unsigned long long int) i->GetSize() + endhl, i->GetModif()); i->SetNonBlock(); a = new CopyJob(i, &s); diff --git a/lib/Variables.cc b/lib/Variables.cc index 94c4c27..69a7f58 100644 --- a/lib/Variables.cc +++ b/lib/Variables.cc @@ -57,7 +57,6 @@ void Variables::Dump(Handle * h, const String & format) { } else { // Use format here... // **FIXME** -#warning FIXME } } } |