mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaup up the result codes

Browse source
This commit is contained in:
Wim Taymans 2017-11-10 16:11:53 +01:00
parent caaeaff223
commit dda28b1589
10 changed files with 63 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/include/spa/pod/parser.h
View file

@ -206,7 +206,7 @@ static inline int spa_pod_parser_getv(struct spa_pod_parser *parser,
switch (*format) {
case '<':
if (pod == NULL || SPA_POD_TYPE(pod) != SPA_POD_TYPE_OBJECT)
return SPA_RESULT_ERROR;
return SPA_RESULT_INCOMPATIBLE;
if (++parser->depth >= SPA_POD_MAX_DEPTH)
return SPA_RESULT_INVALID_ARGUMENTS;
@ -215,7 +215,7 @@ static inline int spa_pod_parser_getv(struct spa_pod_parser *parser,
goto read_pod;
case '[':
if (pod == NULL || SPA_POD_TYPE(pod) != SPA_POD_TYPE_STRUCT)
return SPA_RESULT_ERROR;
return SPA_RESULT_INCOMPATIBLE;
if (++parser->depth >= SPA_POD_MAX_DEPTH)
return SPA_RESULT_INVALID_ARGUMENTS;
@ -224,7 +224,7 @@ static inline int spa_pod_parser_getv(struct spa_pod_parser *parser,
goto read_pod;
case ']': case '>':
if (current != NULL)
return SPA_RESULT_ERROR;
return SPA_RESULT_INCOMPATIBLE;
if (--parser->depth < 0)
return SPA_RESULT_INVALID_ARGUMENTS;

79
spa/include/spa/utils/defs.h
View file

@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef __SPA_DEFS_H__
#define __SPA_DEFS_H__
#ifndef __SPA_UTILS_DEFS_H__
#define __SPA_UTILS_DEFS_H__
#ifdef __cplusplus
extern "C" {
@ -36,45 +36,40 @@ enum spa_result {
SPA_RESULT_OK = 0,
SPA_RESULT_ERROR = -1,
SPA_RESULT_ERRNO = -2,
SPA_RESULT_INACTIVE = -3,
SPA_RESULT_NO_FORMAT = -4,
SPA_RESULT_INVALID_COMMAND = -5,
SPA_RESULT_INVALID_PORT = -6,
SPA_RESULT_HAVE_BUFFER = -7,
SPA_RESULT_NEED_BUFFER = -8,
SPA_RESULT_PORTS_CHANGED = -9,
SPA_RESULT_FORMAT_CHANGED = -10,
SPA_RESULT_PROPERTIES_CHANGED = -11,
SPA_RESULT_NOT_IMPLEMENTED = -12,
SPA_RESULT_INVALID_PROPERTY_INDEX = -13,
SPA_RESULT_PROPERTY_UNSET = -14,
SPA_RESULT_ENUM_END = -15,
SPA_RESULT_WRONG_PROPERTY_TYPE = -16,
SPA_RESULT_WRONG_PROPERTY_SIZE = -17,
SPA_RESULT_INVALID_MEDIA_TYPE = -18,
SPA_RESULT_INVALID_FORMAT_PROPERTIES = -19,
SPA_RESULT_FORMAT_INCOMPLETE = -20,
SPA_RESULT_INVALID_ARGUMENTS = -21,
SPA_RESULT_UNKNOWN_INTERFACE = -22,
SPA_RESULT_INVALID_DIRECTION = -23,
SPA_RESULT_TOO_MANY_PORTS = -24,
SPA_RESULT_INVALID_PROPERTY_ACCESS = -25,
SPA_RESULT_UNEXPECTED = -26,
SPA_RESULT_NO_BUFFERS = -27,
SPA_RESULT_INVALID_BUFFER_ID = -28,
SPA_RESULT_WRONG_STATE = -29,
SPA_RESULT_ASYNC_BUSY = -30,
SPA_RESULT_INVALID_OBJECT_ID = -31,
SPA_RESULT_NO_MEMORY = -32,
SPA_RESULT_NO_PERMISSION = -33,
SPA_RESULT_SKIPPED = -34,
SPA_RESULT_OUT_OF_BUFFERS = -35,
SPA_RESULT_INCOMPATIBLE_PROPS = -36,
SPA_RESULT_INCOMPATIBLE_VERSION = -37,
SPA_RESULT_NOT_FOUND = -38,
SPA_RESULT_BUSY = -39,
SPA_RESULT_UNKNOWN_PARAM = -40,
SPA_RESULT_PARAM_INCOMPLETE = -41,
SPA_RESULT_NOT_FOUND = -3,
SPA_RESULT_BUSY = -4,
SPA_RESULT_NO_MEMORY = -5,
SPA_RESULT_NO_PERMISSION = -6,
SPA_RESULT_INVALID_ARGUMENTS = -7,
SPA_RESULT_NOT_IMPLEMENTED = -8,
SPA_RESULT_UNKNOWN_INTERFACE = -9,
SPA_RESULT_UNEXPECTED = -10,
SPA_RESULT_INCOMPATIBLE = -11,
SPA_RESULT_INCOMPATIBLE_VERSION = -12,
SPA_RESULT_INCOMPLETE = -13,
SPA_RESULT_ENUM_END = -14,
SPA_RESULT_INACTIVE = -15,
SPA_RESULT_INVALID_COMMAND = -16,
SPA_RESULT_INVALID_PORT = -17,
SPA_RESULT_INVALID_DIRECTION = -18,
SPA_RESULT_PORTS_CHANGED = -19,
SPA_RESULT_TOO_MANY_PORTS = -20,
SPA_RESULT_PARAM_CHANGED = -21,
SPA_RESULT_PARAM_UNSET = -22,
SPA_RESULT_UNKNOWN_PARAM = -23,
SPA_RESULT_NO_FORMAT = -24,
SPA_RESULT_FORMAT_CHANGED = -25,
SPA_RESULT_INVALID_MEDIA_TYPE = -26,
SPA_RESULT_INVALID_BUFFER_ID = -27,
SPA_RESULT_NO_BUFFERS = -28,
SPA_RESULT_OUT_OF_BUFFERS = -29,
SPA_RESULT_HAVE_BUFFER = -30,
SPA_RESULT_NEED_BUFFER = -31,
};
#define SPA_ASYNC_BIT (1 << 30)
@ -193,4 +188,4 @@ struct spa_fraction {
} /* extern "C" */
#endif
#endif /* __SPA_DEFS_H__ */
#endif /* __SPA_UTILS_DEFS_H__ */