Mercurial > blahgd > fmt4

changeset 1149:aae32bbbf806

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
post: post refreshing can fail Move the assertions to the callers. Eventually, the callers can be fixed to properly propagate the errors upward. Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Wed, 14 Nov 2018 10:36:45 -0500
parents 74e981842ba9
children 67496ee6fb3d
files post.c post.h post_nv.c
diffstat 3 files changed, 5 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/post.c	Wed Nov 14 10:34:32 2018 -0500
+++ b/post.c	Wed Nov 14 10:36:45 2018 -0500
@@ -403,7 +403,7 @@
 	return false;
 }
 
-int __refresh(struct post *post)
+int post_refresh(struct post *post)
 {
 	int ret;
 
@@ -431,11 +431,6 @@
 	return 0;
 }
 
-void post_refresh(struct post *post)
-{
-	ASSERT0(__refresh(post));
-}
-
 struct post *load_post(int postid, bool preview)
 {
 	struct post *post;
@@ -480,7 +475,7 @@
 		goto err_free;
 	}
 
-	if ((err = __refresh(post)))
+	if ((err = post_refresh(post)))
 		goto err_free;
 
 	if (!post->preview)
--- a/post.h	Wed Nov 14 10:34:32 2018 -0500
+++ b/post.h	Wed Nov 14 10:36:45 2018 -0500
@@ -86,7 +86,7 @@
 extern void init_post_subsys(void);
 extern struct str *post_get_cached_file(struct post *post, const char *path);
 extern struct post *load_post(int postid, bool preview);
-extern void post_refresh(struct post *post);
+extern int post_refresh(struct post *post);
 extern void post_destroy(struct post *post);
 extern void load_posts(struct req *req, struct post **posts, int nposts,
 		       bool moreposts);
--- a/post_nv.c	Wed Nov 14 10:34:32 2018 -0500
+++ b/post_nv.c	Wed Nov 14 10:36:45 2018 -0500
@@ -170,7 +170,7 @@
 		return NULL;
 
 	post_lock(post);
-	post_refresh(post);
+	ASSERT0(post_refresh(post));
 
 	out = __store_vars(req, post, titlevar);
 
@@ -203,7 +203,7 @@
 		struct post *post = posts[i];
 
 		post_lock(post);
-		post_refresh(post);
+		ASSERT0(post_refresh(post));
 
 		nvposts[nnvposts] = nvl_cast_to_val(__store_vars(req, post, NULL));
 		if (IS_ERR(nvposts[nnvposts])) {