mirror of
https://abf.rosa.ru/djam/colord.git
synced 2025-02-24 06:22:57 +00:00
222 lines
5.9 KiB
Diff
222 lines
5.9 KiB
Diff
From d8076a16ea1f4437cca3799d414faf40cddae955 Mon Sep 17 00:00:00 2001
|
|
From: psykose <alice@ayaya.dev>
|
|
Date: Thu, 8 Feb 2024 13:12:41 +0000
|
|
Subject: [PATCH] use char * instead of gchar * for pointers passed to
|
|
sqlite3_exec
|
|
|
|
---
|
|
src/cd-device-db.c | 16 ++++++++--------
|
|
src/cd-mapping-db.c | 18 +++++++++---------
|
|
src/cd-profile-db.c | 10 +++++-----
|
|
3 files changed, 22 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/src/cd-device-db.c b/src/cd-device-db.c
|
|
index 3ae44ef2..ac87a527 100644
|
|
--- a/src/cd-device-db.c
|
|
+++ b/src/cd-device-db.c
|
|
@@ -48,7 +48,7 @@ cd_device_db_load (CdDeviceDb *ddb,
|
|
{
|
|
CdDeviceDbPrivate *priv = GET_PRIVATE (ddb);
|
|
const gchar *statement;
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gint rc;
|
|
g_autofree gchar *path = NULL;
|
|
|
|
@@ -109,7 +109,7 @@ cd_device_db_empty (CdDeviceDb *ddb,
|
|
{
|
|
CdDeviceDbPrivate *priv = GET_PRIVATE (ddb);
|
|
const gchar *statement;
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gint rc;
|
|
|
|
g_return_val_if_fail (CD_IS_DEVICE_DB (ddb), FALSE);
|
|
@@ -137,7 +137,7 @@ cd_device_db_add (CdDeviceDb *ddb,
|
|
{
|
|
CdDeviceDbPrivate *priv = GET_PRIVATE (ddb);
|
|
gboolean ret = TRUE;
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gchar *statement;
|
|
gint rc;
|
|
|
|
@@ -175,7 +175,7 @@ cd_device_db_set_property (CdDeviceDb *ddb,
|
|
{
|
|
CdDeviceDbPrivate *priv = GET_PRIVATE (ddb);
|
|
gboolean ret = TRUE;
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gchar *statement;
|
|
gint rc;
|
|
|
|
@@ -212,7 +212,7 @@ cd_device_db_remove (CdDeviceDb *ddb,
|
|
{
|
|
CdDeviceDbPrivate *priv = GET_PRIVATE (ddb);
|
|
gboolean ret = TRUE;
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gchar *statement1 = NULL;
|
|
gchar *statement2 = NULL;
|
|
gint rc;
|
|
@@ -277,7 +277,7 @@ cd_device_db_get_property (CdDeviceDb *ddb,
|
|
GError **error)
|
|
{
|
|
CdDeviceDbPrivate *priv = GET_PRIVATE (ddb);
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gchar *statement;
|
|
gint rc;
|
|
gchar *value = NULL;
|
|
@@ -331,7 +331,7 @@ cd_device_db_get_devices (CdDeviceDb *ddb,
|
|
GError **error)
|
|
{
|
|
CdDeviceDbPrivate *priv = GET_PRIVATE (ddb);
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gchar *statement;
|
|
gint rc;
|
|
GPtrArray *array = NULL;
|
|
@@ -372,7 +372,7 @@ cd_device_db_get_properties (CdDeviceDb *ddb,
|
|
GError **error)
|
|
{
|
|
CdDeviceDbPrivate *priv = GET_PRIVATE (ddb);
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gchar *statement;
|
|
gint rc;
|
|
GPtrArray *array = NULL;
|
|
diff --git a/src/cd-mapping-db.c b/src/cd-mapping-db.c
|
|
index 5ffd74dd..291274a4 100644
|
|
--- a/src/cd-mapping-db.c
|
|
+++ b/src/cd-mapping-db.c
|
|
@@ -67,7 +67,7 @@ cd_mapping_db_open (CdMappingDb *mdb,
|
|
GError **error)
|
|
{
|
|
CdMappingDbPrivate *priv = GET_PRIVATE (mdb);
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gint rc;
|
|
g_autofree gchar *path = NULL;
|
|
|
|
@@ -131,7 +131,7 @@ cd_mapping_db_load (CdMappingDb *mdb,
|
|
{
|
|
CdMappingDbPrivate *priv = GET_PRIVATE (mdb);
|
|
const gchar *statement;
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gint rc;
|
|
g_autofree gchar *path = NULL;
|
|
|
|
@@ -230,7 +230,7 @@ cd_mapping_db_empty (CdMappingDb *mdb,
|
|
{
|
|
CdMappingDbPrivate *priv = GET_PRIVATE (mdb);
|
|
const gchar *statement;
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gint rc;
|
|
|
|
g_return_val_if_fail (CD_IS_MAPPING_DB (mdb), FALSE);
|
|
@@ -259,7 +259,7 @@ cd_mapping_db_add (CdMappingDb *mdb,
|
|
{
|
|
CdMappingDbPrivate *priv = GET_PRIVATE (mdb);
|
|
gboolean ret = TRUE;
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gchar *statement;
|
|
gint rc;
|
|
gint64 timestamp;
|
|
@@ -307,7 +307,7 @@ cd_mapping_db_clear_timestamp (CdMappingDb *mdb,
|
|
{
|
|
CdMappingDbPrivate *priv = GET_PRIVATE (mdb);
|
|
gboolean ret = TRUE;
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gchar *statement;
|
|
gint rc;
|
|
|
|
@@ -351,7 +351,7 @@ cd_mapping_db_remove (CdMappingDb *mdb,
|
|
{
|
|
CdMappingDbPrivate *priv = GET_PRIVATE (mdb);
|
|
gboolean ret = TRUE;
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gchar *statement;
|
|
gint rc;
|
|
|
|
@@ -406,7 +406,7 @@ cd_mapping_db_get_profiles (CdMappingDb *mdb,
|
|
GError **error)
|
|
{
|
|
CdMappingDbPrivate *priv = GET_PRIVATE (mdb);
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gchar *statement;
|
|
gint rc;
|
|
GPtrArray *array = NULL;
|
|
@@ -456,7 +456,7 @@ cd_mapping_db_get_devices (CdMappingDb *mdb,
|
|
GError **error)
|
|
{
|
|
CdMappingDbPrivate *priv = GET_PRIVATE (mdb);
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gchar *statement;
|
|
gint rc;
|
|
GPtrArray *array = NULL;
|
|
@@ -522,7 +522,7 @@ cd_mapping_db_get_timestamp (CdMappingDb *mdb,
|
|
GError **error)
|
|
{
|
|
CdMappingDbPrivate *priv = GET_PRIVATE (mdb);
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gchar *statement;
|
|
gint rc;
|
|
guint64 timestamp = G_MAXUINT64;
|
|
diff --git a/src/cd-profile-db.c b/src/cd-profile-db.c
|
|
index e5b74e37..124fa09f 100644
|
|
--- a/src/cd-profile-db.c
|
|
+++ b/src/cd-profile-db.c
|
|
@@ -48,7 +48,7 @@ cd_profile_db_load (CdProfileDb *pdb,
|
|
{
|
|
CdProfileDbPrivate *priv = GET_PRIVATE (pdb);
|
|
const gchar *statement;
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gint rc;
|
|
g_autofree gchar *path = NULL;
|
|
|
|
@@ -98,7 +98,7 @@ cd_profile_db_empty (CdProfileDb *pdb, GError **error)
|
|
{
|
|
CdProfileDbPrivate *priv = GET_PRIVATE (pdb);
|
|
const gchar *statement;
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gint rc;
|
|
|
|
g_return_val_if_fail (CD_IS_PROFILE_DB (pdb), FALSE);
|
|
@@ -129,7 +129,7 @@ cd_profile_db_set_property (CdProfileDb *pdb,
|
|
{
|
|
CdProfileDbPrivate *priv = GET_PRIVATE (pdb);
|
|
gboolean ret = TRUE;
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gchar *statement;
|
|
gint rc;
|
|
|
|
@@ -169,7 +169,7 @@ cd_profile_db_remove (CdProfileDb *pdb,
|
|
{
|
|
CdProfileDbPrivate *priv = GET_PRIVATE (pdb);
|
|
gboolean ret = TRUE;
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gchar *statement = NULL;
|
|
gint rc;
|
|
|
|
@@ -223,7 +223,7 @@ cd_profile_db_get_property (CdProfileDb *pdb,
|
|
{
|
|
CdProfileDbPrivate *priv = GET_PRIVATE (pdb);
|
|
gboolean ret = TRUE;
|
|
- gchar *error_msg = NULL;
|
|
+ char *error_msg = NULL;
|
|
gchar *statement;
|
|
gint rc;
|
|
|