|
 |
fcfddd |
From c84c2a02a34031a951edeb5d3f81676d05e2765f Mon Sep 17 00:00:00 2001
|
|
|
fcfddd |
From: Kamil Dudka <kdudka@redhat.com>
|
|
|
fcfddd |
Date: Tue, 26 Feb 2013 14:49:47 +0100
|
|
|
fcfddd |
Subject: [PATCH 2/4] pycurl.c: eliminate duplicated code in util_write_callback()
|
|
|
fcfddd |
|
|
|
fcfddd |
Suggested by Zdenek Pavlas <https://bugzilla.redhat.com/857875#c8>.
|
|
|
fcfddd |
---
|
|
|
fcfddd |
src/pycurl.c | 10 +---------
|
|
|
fcfddd |
1 files changed, 1 insertions(+), 9 deletions(-)
|
|
|
fcfddd |
|
|
|
fcfddd |
diff --git a/src/pycurl.c b/src/pycurl.c
|
|
|
fcfddd |
index 74f5248..f197145 100644
|
|
|
fcfddd |
--- a/src/pycurl.c
|
|
|
fcfddd |
+++ b/src/pycurl.c
|
|
|
fcfddd |
@@ -1080,15 +1080,7 @@ util_write_callback(int flags, char *ptr, size_t size, size_t nmemb, void *strea
|
|
|
fcfddd |
if (result == Py_None) {
|
|
|
fcfddd |
ret = total_size; /* None means success */
|
|
|
fcfddd |
}
|
|
|
fcfddd |
- else if (PyInt_Check(result)) {
|
|
|
fcfddd |
- long obj_size = PyInt_AsLong(result);
|
|
|
fcfddd |
- if (obj_size < 0 || obj_size > total_size) {
|
|
|
fcfddd |
- PyErr_Format(ErrorObject, "invalid return value for write callback %ld %ld", (long)obj_size, (long)total_size);
|
|
|
fcfddd |
- goto verbose_error;
|
|
|
fcfddd |
- }
|
|
|
fcfddd |
- ret = (size_t) obj_size; /* success */
|
|
|
fcfddd |
- }
|
|
|
fcfddd |
- else if (PyLong_Check(result)) {
|
|
|
fcfddd |
+ else if (PyInt_Check(result) || PyLong_Check(result)) {
|
|
|
fcfddd |
long obj_size = PyLong_AsLong(result);
|
|
|
fcfddd |
if (obj_size < 0 || obj_size > total_size) {
|
|
|
fcfddd |
PyErr_Format(ErrorObject, "invalid return value for write callback %ld %ld", (long)obj_size, (long)total_size);
|
|
|
fcfddd |
--
|
|
|
fcfddd |
1.7.1
|
|
|
fcfddd |
|