lib/format.c: refactor a bit

Author: Duncaen

include/xbps.h.in

@@ -2372,19 +2372,35 @@ xbps_plist_dictionary_from_file(const char *path);
  * @struct xbps_fmt xbps.h "xbps.h"
  * @brief Structure of parsed format string.
  */
-struct xbps_fmt;
+struct xbps_fmt {
+	/**
+	 * @private
+	 * @var prefix
+	 * @brief Prefix of the format chunk.
+	 */
+	char *prefix;
+	/**
+	 * @var var
+	 * @brief Variable name.
+	 */
+	char *var;
+	/**
+	 * @var conv
+	 * @brief Format conversion.
+	 */
+	struct xbps_fmt_conv *conv;
+	/**
+	 * @var spec
+	 * @brief Format specification.
+	 */
+	struct xbps_fmt_spec *spec;
+};
 
 /**
  * @struct xbps_fmt xbps.h "xbps.h"
  * @brief Structure of parsed format specifier.
  */
 struct xbps_fmt_spec {
-	/**
-	 * @private
-	 * @var conversion
-	 * @brief Output conversion.
-	 */
-	struct conversion *conversion;
 	/**
 	 * @var fill
 	 * @brief Padding character.
@@ -2445,7 +2461,7 @@ struct xbps_fmt_spec {
  * @param[in] var The format string variable name.
  * @param[in] data Userdata passed to the xbps_fmt() function.
  */
-typedef int (xbps_fmt_cb)(FILE *fp, const struct xbps_fmt_spec *spec, const char *var, void *data);
+typedef int (xbps_fmt_cb)(FILE *fp, const struct xbps_fmt *fmt, void *data);
 
 /**
  * @brief Parses the format string \a format.
@@ -2532,15 +2548,15 @@ int xbps_fmts(const char *format, xbps_fmt_cb *cb, void *data, FILE *fp);
 /**
  * @brief Print formatted number to \a fp.
  *
- * Prints the number \d to \a fp according to the specification \a spec.
+ * Prints the number \a num to \a fp according to the specification \a spec.
  *
  * @param[in] spec Format specification.
  * @param[in] num Number to print.
  * @param[in] fp File to print to.
  *
  * @return Returns 0 on success.
  */
-int xbps_fmt_number(const struct xbps_fmt_spec *spec, int64_t num, FILE *fp);
+int xbps_fmt_print_number(const struct xbps_fmt *fmt, int64_t num, FILE *fp);
 
 /**
  * @brief Print formatted string to \a fp.
@@ -2554,7 +2570,20 @@ int xbps_fmt_number(const struct xbps_fmt_spec *spec, int64_t num, FILE *fp);
  *
  * @return Returns 0 on success.
  */
-int xbps_fmt_string(const struct xbps_fmt_spec *spec, const char *str, size_t len, FILE *fp);
+int xbps_fmt_print_string(const struct xbps_fmt *fmt, const char *str, size_t len, FILE *fp);
+
+/**
+ * @brief Print formatted ::xbps_object_t to \a fp.
+ *
+ * Prints the ::xbps_object_t \a obj to \a fp according to the specification \a spec.
+ *
+ * @param[in] spec Format specification.
+ * @param[in] obj The object to print.
+ * @param[in] fp File to print to.
+ *
+ * @return Returns 0 on success.
+ */
+int xbps_fmt_print_object(const struct xbps_fmt *fmt, xbps_object_t obj, FILE *fp);
 
 /**@}*/