BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SR_OK_CONTINUE. 

This brings error reporting back to the usual: either return codes
are SR_OK (0) or they are < 1 indicating an error.

This fixes bug #633.
This commit is contained in:
Bert Vermeulen 2015-08-30 21:15:02 +02:00 committed by Uwe Hermann
parent b93006789f
commit b05409d792
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/libsigrok/libsigrok.h
View File

@ -64,7 +64,6 @@ extern "C" {
/** Status/error codes returned by libsigrok functions. */ /** Status/error codes returned by libsigrok functions. */
enum sr_error_code { enum sr_error_code {
SR_OK_CONTINUE = 1, /**< Keep going. */
SR_OK = 0, /**< No error. */ SR_OK = 0, /**< No error. */
SR_ERR = -1, /**< Generic/unspecified error. */ SR_ERR = -1, /**< Generic/unspecified error. */
SR_ERR_MALLOC = -2, /**< Malloc/calloc/realloc error. */ SR_ERR_MALLOC = -2, /**< Malloc/calloc/realloc error. */

4
src/error.c
View File

@ -58,8 +58,6 @@ SR_API const char *sr_strerror(int error_code)
*/ */
switch (error_code) { switch (error_code) {
case SR_OK_CONTINUE:
return "not enough data to decide error status yet";
case SR_OK: case SR_OK:
return "no error"; return "no error";
case SR_ERR: case SR_ERR:
@ -115,8 +113,6 @@ SR_API const char *sr_strerror_name(int error_code)
*/ */
switch (error_code) { switch (error_code) {
case SR_OK_CONTINUE:
return "SR_OK_CONTINUE";
case SR_OK: case SR_OK:
return "SR_OK"; return "SR_OK";
case SR_ERR: case SR_ERR: