now attached -- Please do not send copies of list mail to me; I read the list! .''`. martin f. krafft <[EMAIL PROTECTED]> : :' : proud Debian developer and author: http://debiansystem.info `. `'` `- Debian - when you have better things to do than fixing a system
Index: buffy/wibble/exception.cpp
===================================================================
--- buffy/wibble/exception.cpp (revision 182)
+++ buffy/wibble/exception.cpp (working copy)
@@ -113,14 +113,14 @@
void to::test<1>()
{
try {
- throw exception::Generic("antani");
+ throw wibble::exception::Generic("antani");
} catch ( std::exception& e ) {
ensure(string(e.what()).find("antani") != string::npos);
}
try {
- throw exception::Generic("antani");
- } catch ( exception::Generic& e ) {
+ throw wibble::exception::Generic("antani");
+ } catch ( wibble::exception::Generic& e ) {
ensure(e.fullInfo().find("antani") != string::npos);
}
}
@@ -131,16 +131,16 @@
{
try {
ensure_equals(access("does-not-exist", F_OK), -1);
- throw exception::System("checking for existance of nonexisting
file");
- } catch ( exception::System& e ) {
+ throw wibble::exception::System("checking for existance of
nonexisting file");
+ } catch ( wibble::exception::System& e ) {
// Check that we caught the right value of errno
ensure_equals(e.code(), ENOENT);
}
try {
ensure_equals(access("does-not-exist", F_OK), -1);
- throw exception::File("does-not-exist", "checking for existance
of nonexisting file");
- } catch ( exception::File& e ) {
+ throw wibble::exception::File("does-not-exist", "checking for
existance of nonexisting file");
+ } catch ( wibble::exception::File& e ) {
// Check that we caught the right value of errno
ensure_equals(e.code(), ENOENT);
ensure(e.fullInfo().find("does-not-exist") != string::npos);
Index: buffy/MaildirMailFolder.cc
===================================================================
--- buffy/MaildirMailFolder.cc (revision 182)
+++ buffy/MaildirMailFolder.cc (working copy)
@@ -115,7 +115,7 @@
return;
}
if (S_ISDIR(st_new.st_mode) == 0)
- throw exception::Consistency(path_new + " is not a directory");
+ throw wibble::exception::Consistency(path_new + " is not a
directory");
// Perform consistency checks on the 'cur' directory
struct stat st_cur;
@@ -129,7 +129,7 @@
return;
}
if (S_ISDIR(st_cur.st_mode) == 0)
- throw exception::Consistency(path_cur + " is not a directory");
+ throw wibble::exception::Consistency(path_cur + " is not a
directory");
if (_deleted)
_deleted = false;
@@ -236,7 +236,7 @@
try {
if (isMaildir(path))
return MailFolder(new MaildirMailFolder(path));
- } catch (exception::Generic& e) {
+ } catch (wibble::exception::Generic& e) {
// FIXME: cerr << e.type() << ": " << e.fullInfo() << endl;
}
return MailFolder();
@@ -282,7 +282,7 @@
enumerateSubfolders(parent + "/" + d->d_name, name +
"." + d->d_name, cons, seen + st.st_ino);
}
- } catch (exception::Generic& e) {
+ } catch (wibble::exception::Generic& e) {
// FIXME: cerr << e.type() << ": " << e.fullInfo() << endl;
}
}
Index: buffy/config/Storage.cc
===================================================================
--- buffy/config/Storage.cc (revision 182)
+++ buffy/config/Storage.cc (working copy)
@@ -95,16 +95,16 @@
struct stat rcfile_stat;
doc_conf_needs_freeing = false;
if (stat(rcfile.c_str(), &rcfile_stat) == -1)
- throw exception::File(rcfile, "reading stat() information");
+ throw wibble::exception::File(rcfile, "reading stat()
information");
if (!m_xml_parser)
m_xml_parser = new xmlpp::DomParser();
if (S_ISDIR(rcfile_stat.st_mode))
- throw exception::Consistency(rcfile + " already exists and is a
directory");
+ throw wibble::exception::Consistency(rcfile + " already exists
and is a directory");
if (access(rcfile.c_str(), R_OK) == -1)
- throw exception::Consistency(rcfile + " already exists and is
not readable");
+ throw wibble::exception::Consistency(rcfile + " already exists
and is not readable");
// feedback("Reading configuration from %.*s.\n",
PFSTR(rcfile));
@@ -117,9 +117,9 @@
if (*m_xml_parser)
doc_conf = m_xml_parser->get_document();
else
- throw exception::Consistency("Parser did not parse " +
rcfile);
+ throw wibble::exception::Consistency("Parser did not
parse " + rcfile);
} catch (const std::exception& ex) {
- throw exception::Consistency(string(ex.what()) + " when parsing
configuration file " + rcfile);
+ throw wibble::exception::Consistency(string(ex.what()) + " when
parsing configuration file " + rcfile);
}
m_el_root = doc_conf->get_root_node();
@@ -135,7 +135,7 @@
}// else
// feedback("No configuration present: ignoring save
request.\n");
} catch (const std::exception& ex) {
- throw exception::Consistency(string(ex.what()) + " when saving
configuration file " + file);
+ throw wibble::exception::Consistency(string(ex.what()) + " when
saving configuration file " + file);
}
}
Index: buffy/config/Config.cc
===================================================================
--- buffy/config/Config.cc (revision 182)
+++ buffy/config/Config.cc (working copy)
@@ -164,16 +164,16 @@
pid_t child = fork();
if (child == -1)
- throw exception::System("trying to fork a child process");
+ throw wibble::exception::System("trying to fork a child
process");
if (child == 0)
{
// Child code path
try {
if (execl("/bin/sh", "/bin/sh", "-c", cmd.c_str(), 0)
== -1)
- throw exception::System("trying to fork a child
process");
- throw exception::System("trying to fork a child
process");
- } catch (exception::Generic& e) {
+ throw wibble::exception::System("trying to fork
a child process");
+ throw wibble::exception::System("trying to fork a child
process");
+ } catch (wibble::exception::Generic& e) {
cerr << e.type() << ": " << e.fullInfo() << endl;
}
_exit(0);
@@ -241,11 +241,11 @@
MailProgramNode MailProgramsNode::selected() const
{
xmlpp::Element* n = m_config->nodeOrDefault(m_path);
- if (n == 0) throw exception::Consistency("No mail programs accessible
at " + m_path);
+ if (n == 0) throw wibble::exception::Consistency("No mail programs
accessible at " + m_path);
xmlpp::Node::NodeList nl = n->get_children("mail");
if (nl.empty())
- throw exception::Consistency("No mail programs available at " +
m_path);
+ throw wibble::exception::Consistency("No mail programs
available at " + m_path);
// First try to get the first selected element
for (xmlpp::Node::NodeList::const_iterator i = nl.begin(); i !=
nl.end(); i++)
@@ -263,7 +263,7 @@
if (xmlpp::Attribute* name = e->get_attribute("name"))
return MailProgramNode(*this->m_config,
this->m_path + "/mail[" + Storage::escape(name->get_value()) + "]");
- throw exception::Consistency("No mail programs available at " + m_path);
+ throw wibble::exception::Consistency("No mail programs available at " +
m_path);
}
#if 0
Index: buffy/System.cc
===================================================================
--- buffy/System.cc (revision 182)
+++ buffy/System.cc (working copy)
@@ -17,13 +17,13 @@
Directory::Directory(const std::string& name) : dir(0)
{
if ((dir = opendir(name.c_str())) == NULL)
- throw exception::File(name, "opening directory");
+ throw wibble::exception::File(name, "opening directory");
}
void stat(const std::string& name, struct stat* st)
{
if (::stat(name.c_str(), st) != 0)
- throw exception::File(name, "getting stat()
informations");
+ throw wibble::exception::File(name, "getting stat()
informations");
}
bool statIfFound(const std::string& name, struct stat* st)
@@ -32,7 +32,7 @@
if (errno == ENOENT)
return false;
else
- throw exception::File(name, "getting stat()
informations");
+ throw wibble::exception::File(name, "getting stat()
informations");
return true;
}
Index: buffy/MailboxMailFolder.cc
===================================================================
--- buffy/MailboxMailFolder.cc (revision 182)
+++ buffy/MailboxMailFolder.cc (working copy)
@@ -141,7 +141,7 @@
return;
}
if (S_ISDIR(st.st_mode) != 0)
- throw exception::Consistency(_path + " is a directory");
+ throw wibble::exception::Consistency(_path + " is a directory");
if (_deleted)
_deleted = false;
@@ -163,7 +163,7 @@
// Count the messages
in = gzopen(_path.c_str(), "rb");
if (in == NULL)
- throw exception::File(_path, "opening file");
+ throw wibble::exception::File(_path, "opening file");
static const int bufsize = 1024;
char buf[bufsize];
@@ -232,7 +232,7 @@
// Check if it starts with a From line
gzFile in = gzopen(pathname.c_str(), "rb");
if (in == NULL)
- throw exception::File(pathname, "opening file");
+ throw wibble::exception::File(pathname, "opening file");
static const int bufsize = 1024;
char buf[bufsize];
@@ -257,7 +257,7 @@
try {
if (isMailbox(path))
return MailFolder(new MailboxMailFolder(path));
- } catch (exception::Generic& e) {
+ } catch (wibble::exception::Generic& e) {
// FIXME cerr << e.type() << ": " << e.fullInfo() << endl;
}
return MailFolder();
signature.asc
Description: Digital signature (GPG/PGP)
