ruleset: tidy

Signed-off-by: He Xian <[email protected]>

src/api_server.c

@@ -178,10 +178,10 @@ static void server_stats(
 		xfer_down);
 
 #if WITH_RULESET
-	const struct ruleset *r = G.ruleset;
-	if (r != NULL) {
+	const struct ruleset *ruleset = G.ruleset;
+	if (ruleset != NULL) {
 		struct ruleset_vmstats vmstats;
-		ruleset_vmstats(r, &vmstats);
+		ruleset_vmstats(ruleset, &vmstats);
 		append_memstats(buf, &vmstats);
 	}
 #endif
@@ -718,8 +718,6 @@ static void idle_cb(struct ev_loop *loop, struct ev_idle *watcher, int revents)
 {
 	CHECK_REVENTS(revents, EV_IDLE);
 	ev_idle_stop(loop, watcher);
-	struct ruleset *restrict ruleset = G.ruleset;
-	ASSERT(ruleset != NULL);
 	struct api_ctx *restrict ctx = watcher->data;
 	http_handle_ruleset(loop, ctx);
 }

src/ruleset.c

@@ -214,7 +214,7 @@ const char *ruleset_geterror(struct ruleset *restrict r, size_t *len)
 	return s;
 }
 
-bool ruleset_invoke(struct ruleset *r, struct stream *code)
+bool ruleset_invoke(struct ruleset *restrict r, struct stream *code)
 {
 	return ruleset_pcall(r, cfunc_invoke, 1, 0, code);
 }
@@ -234,8 +234,8 @@ void ruleset_cancel(struct ruleset_state *state)
 }
 
 bool ruleset_rpcall(
-	struct ruleset *r, struct ruleset_state **state, struct stream *code,
-	const struct ruleset_rpcall_cb *callback)
+	struct ruleset *restrict r, struct ruleset_state **state,
+	struct stream *code, const struct ruleset_rpcall_cb *callback)
 {
 	const bool ok =
 		ruleset_pcall(r, cfunc_rpcall, 3, 1, state, code, callback);
@@ -246,13 +246,13 @@ bool ruleset_rpcall(
 }
 
 bool ruleset_update(
-	struct ruleset *r, const char *modname, const char *chunkname,
+	struct ruleset *restrict r, const char *modname, const char *chunkname,
 	struct stream *code)
 {
 	return ruleset_pcall(r, cfunc_update, 3, 0, modname, chunkname, code);
 }
 
-bool ruleset_loadfile(struct ruleset *r, const char *filename)
+bool ruleset_loadfile(struct ruleset *restrict r, const char *filename)
 {
 	return ruleset_pcall(r, cfunc_loadfile, 1, 0, filename);
 }
@@ -280,26 +280,26 @@ static bool dispatch_req(
 }
 
 bool ruleset_resolve(
-	struct ruleset *r, struct ruleset_state **state, const char *request,
-	const char *username, const char *password,
+	struct ruleset *restrict r, struct ruleset_state **state,
+	const char *request, const char *username, const char *password,
 	const struct ruleset_request_cb *callback)
 {
 	return dispatch_req(
 		r, state, "resolve", request, username, password, callback);
 }
 
 bool ruleset_route(
-	struct ruleset *r, struct ruleset_state **state, const char *request,
-	const char *username, const char *password,
+	struct ruleset *restrict r, struct ruleset_state **state,
+	const char *request, const char *username, const char *password,
 	const struct ruleset_request_cb *callback)
 {
 	return dispatch_req(
 		r, state, "route", request, username, password, callback);
 }
 
 bool ruleset_route6(
-	struct ruleset *r, struct ruleset_state **state, const char *request,
-	const char *username, const char *password,
+	struct ruleset *restrict r, struct ruleset_state **state,
+	const char *request, const char *username, const char *password,
 	const struct ruleset_request_cb *callback)
 {
 	return dispatch_req(

src/ruleset.h

@@ -20,9 +20,9 @@ struct ruleset_vmstats {
 struct ruleset *ruleset_new(struct ev_loop *loop);
 void ruleset_free(struct ruleset *r);
 
-const char *ruleset_geterror(struct ruleset *r, size_t *len);
+const char *ruleset_geterror(struct ruleset *ruleset, size_t *len);
 
-bool ruleset_invoke(struct ruleset *r, struct stream *code);
+bool ruleset_invoke(struct ruleset *ruleset, struct stream *code);
 
 struct ruleset_state;
 void ruleset_cancel(struct ruleset_state *state);
@@ -32,13 +32,13 @@ struct ruleset_rpcall_cb {
 	void *data;
 };
 bool ruleset_rpcall(
-	struct ruleset *r, struct ruleset_state **state, struct stream *code,
-	const struct ruleset_rpcall_cb *callback);
+	struct ruleset *ruleset, struct ruleset_state **state,
+	struct stream *code, const struct ruleset_rpcall_cb *callback);
 
 bool ruleset_update(
-	struct ruleset *r, const char *modname, const char *chunkname,
+	struct ruleset *ruleset, const char *modname, const char *chunkname,
 	struct stream *code);
-bool ruleset_loadfile(struct ruleset *r, const char *filename);
+bool ruleset_loadfile(struct ruleset *ruleset, const char *filename);
 
 bool ruleset_gc(struct ruleset *r);
 
@@ -48,20 +48,20 @@ struct ruleset_request_cb {
 	void *data;
 };
 bool ruleset_resolve(
-	struct ruleset *r, struct ruleset_state **state, const char *request,
-	const char *username, const char *password,
+	struct ruleset *ruleset, struct ruleset_state **state,
+	const char *request, const char *username, const char *password,
 	const struct ruleset_request_cb *callback);
 bool ruleset_route(
-	struct ruleset *r, struct ruleset_state **state, const char *request,
-	const char *username, const char *password,
+	struct ruleset *ruleset, struct ruleset_state **state,
+	const char *request, const char *username, const char *password,
 	const struct ruleset_request_cb *callback);
 bool ruleset_route6(
-	struct ruleset *r, struct ruleset_state **state, const char *request,
-	const char *username, const char *password,
+	struct ruleset *ruleset, struct ruleset_state **state,
+	const char *request, const char *username, const char *password,
 	const struct ruleset_request_cb *callback);
 
-void ruleset_vmstats(const struct ruleset *r, struct ruleset_vmstats *s);
-const char *
-ruleset_stats(struct ruleset *r, double dt, const char *query, size_t *len);
+void ruleset_vmstats(const struct ruleset *ruleset, struct ruleset_vmstats *s);
+const char *ruleset_stats(
+	struct ruleset *ruleset, double dt, const char *query, size_t *len);
 
 #endif /* RULESET_H */