refactoring (in progress, tbf)

[src/app-framework-binder.git] / src / afb-req-itf.h

diff --git a/src/afb-req-itf.h b/src/afb-req-itf.h
index 6fa854c..ab72a5c 100644 (file)
--- a/src/afb-req-itf.h
+++ b/src/afb-req-itf.h
@@ -15,30 +15,40 @@
  * limitations under the License.
  */
 
+struct afb_arg {
+       const char *name;
+       const char *value;
+       size_t size;
+       int is_file;
+};
 
 struct afb_req_itf {
-       const char *(*get_cookie)(void *data, const char *name);
-       const char *(*get_argument)(void *data, const char *name);
-#if 0
-       int (*set_cookie)(void *data, const char *name, const char *value);
-#endif
+       struct afb_arg (*get)(void *data, const char *name);
+       void (*iterate)(void *data, int (*iterator)(void *closure, struct afb_arg arg), void *closure);
 };
 
 struct afb_req {
-       struct afb_req_itf *itf;
+       const struct afb_req_itf *itf;
        void *data;
 };
 
-inline const char *afb_get_cookie(struct afb_req req, const char *name)
+static inline struct afb_arg afb_req_get(struct afb_req req, const char *name)
 {
-       return req.itf->get_cookie(req.data, name);
+       return req.itf->get(req.data, name);
 }
 
-inline const char *afb_get_argument(struct afb_req req, const char *name)
+static inline const char *afb_req_argument(struct afb_req req, const char *name)
 {
-       return req.itf->get_argument(req.data, name);
+       return afb_req_get(req, name).value;
 }
 
+static inline int afb_req_is_argument_file(struct afb_req req, const char *name)
+{
+       return afb_req_get(req, name).is_file;
+}
 
-
+static inline void afb_req_iterate(struct afb_req req, int (*iterator)(void *closure, struct afb_arg arg), void *closure)
+{
+       req.itf->iterate(req.data, iterator, closure);
+}