Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/imports/avs.h
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ int property_set_flag(struct property *prop, int flags, int mask);
void property_destroy(struct property *prop);

avs_error property_get_error(struct property *prop);
struct property *property_clear_error(struct property *prop);
void property_clear_error(struct property *prop);

int property_psmap_import(
struct property *prop,
Expand Down
10 changes: 10 additions & 0 deletions src/main/avs-util/error.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,14 @@ const char *avs_util_error_str(avs_error error)
}

return avs_util_error_unknown;
}

const char *avs_util_property_error_get_and_clear(struct property *prop)
{
avs_error error;

error = property_get_error(prop);
property_clear_error(prop);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this returns a property* per the earlier stacked commit, is this something we need to be considering?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, I fixed this in #299


return avs_util_error_str(error);
}
4 changes: 3 additions & 1 deletion src/main/avs-util/error.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@

const char *avs_util_error_str(avs_error error);

#endif
const char *avs_util_property_error_get_and_clear(struct property *prop);

#endif