changeset
Fix new warnings in gir generation
Mon, 10 Oct 2022 05:40:25 -0500
- author
- Elliott Sales de Andrade <quantum.analyst@gmail.com>
- date
- Mon, 10 Oct 2022 05:40:25 -0500
- changeset 41810
- bd91865991dc
- parent 41809
- 94c31400486a
- child 41811
- f4ac61968453
Fix new warnings in gir generation
I'm not sure if it makes sense to add the `PurpleSqlite3` type alias (instead of skipping these symbols), as I don't know if bindings will really be able to use it, but perhaps some that still have slightly lower-level access will work.
Testing Done:
Compiled, saw fewer warnings.
Reviewed at https://reviews.imfreedom.org/r/1924/
| libpurple/purplesqlite3.h | file | annotate | diff | comparison | revisions | |
| libpurple/queuedoutputstream.h | file | annotate | diff | comparison | revisions |
--- a/libpurple/purplesqlite3.h Mon Oct 10 05:37:44 2022 -0500 +++ b/libpurple/purplesqlite3.h Mon Oct 10 05:40:25 2022 -0500 @@ -40,6 +40,22 @@ #define PURPLE_SQLITE3_DOMAIN (g_quark_from_static_string("sqlite3")) /** + * PurpleSqlite3: + * + * A sqlite3 connection. + * + * This type alias exists for introspection purposes, and is no different from + * the `sqlite3` type. + * + * Since: 3.0.0 + */ +#ifdef __GI_SCANNER__ +typedef gpointer PurpleSqlite3; +#else +typedef sqlite3 PurpleSqlite3; +#endif + +/** * purple_sqlite3_get_schema_version: * @db: The sqlite3 connection. * @error: (nullable): A return address for a [type@GLib.Error]. @@ -51,7 +67,7 @@ * * Since: 3.0.0 */ -int purple_sqlite3_get_schema_version(sqlite3 *db, GError **error); +int purple_sqlite3_get_schema_version(PurpleSqlite3 *db, GError **error); /** * purple_sqlite3_run_migrations_from_strings: @@ -92,7 +108,7 @@ * * Since: 3.0.0 */ -gboolean purple_sqlite3_run_migrations_from_strings(sqlite3 *db, const char *migrations[], GError **error); +gboolean purple_sqlite3_run_migrations_from_strings(PurpleSqlite3 *db, const char *migrations[], GError **error); /** * purple_sqlite3_run_migrations_from_resources: @@ -118,7 +134,7 @@ * * Since: 3.0.0 */ -gboolean purple_sqlite3_run_migrations_from_resources(sqlite3 *db, const char *path, const char *migrations[], GError **error); +gboolean purple_sqlite3_run_migrations_from_resources(PurpleSqlite3 *db, const char *path, const char *migrations[], GError **error); G_END_DECLS
--- a/libpurple/queuedoutputstream.h Mon Oct 10 05:37:44 2022 -0500 +++ b/libpurple/queuedoutputstream.h Mon Oct 10 05:40:25 2022 -0500 @@ -88,8 +88,8 @@ * purple_queued_output_stream_push_bytes_finish: * @stream: The instance. * @result: The [iface@Gio.AsyncResult] of this operation. - * @error: (nullable) (optional): A [type@Glib.Error] location to store the - * error, or NULL to ignore + * @error: (nullable): A [type@Glib.Error] location to store the error, or + * %NULL to ignore. * * Finishes pushing bytes asynchronously. *
