[evolution-data-server] Simplify camel_imapx_stream_number().
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Simplify camel_imapx_stream_number().
- Date: Sun, 14 Jul 2013 16:58:25 +0000 (UTC)
commit f39f2fd1156a3fb077dadb423c5539f1e6a8229a
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Jul 14 08:45:12 2013 -0400
Simplify camel_imapx_stream_number().
camel/camel-imapx-stream.c | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/camel/camel-imapx-stream.c b/camel/camel-imapx-stream.c
index 16c134d..eba2e30 100644
--- a/camel/camel-imapx-stream.c
+++ b/camel/camel-imapx-stream.c
@@ -599,21 +599,27 @@ camel_imapx_stream_number (CamelIMAPXStream *is,
GCancellable *cancellable,
GError **error)
{
+ camel_imapx_token_t tok;
guchar *token;
guint len;
- GError *local_error = NULL;
g_return_val_if_fail (CAMEL_IS_IMAPX_STREAM (is), 0);
- if (camel_imapx_stream_token (is, &token, &len, cancellable, &local_error) != IMAPX_TOK_INT) {
- if (local_error == NULL)
- g_set_error (error, CAMEL_IMAPX_ERROR, 1, "expecting number");
- else
- g_propagate_error (error, local_error);
- return 0;
- }
+ tok = camel_imapx_stream_token (is, &token, &len, cancellable, error);
+
+ switch (tok) {
+ case IMAPX_TOK_ERROR:
+ return 0;
- return strtoull ((gchar *) token, 0, 10);
+ case IMAPX_TOK_INT:
+ return strtoull ((gchar *) token, 0, 10);
+
+ default:
+ g_set_error (
+ error, CAMEL_IMAPX_ERROR, 1,
+ "expecting number");
+ return 0;
+ }
}
gint
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]