261cbc985a
Copy from devel:libraries:c_c++/libservicelog based on submit request 38203 from user psmt OBS-URL: https://build.opensuse.org/request/show/38203 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libservicelog?expand=0&rev=6
126 lines
3.8 KiB
Diff
126 lines
3.8 KiB
Diff
diff -uNrp libservicelog-1.0.1/src/event.c libservicelog-1.0.1-new/src/event.c
|
|
--- libservicelog-1.0.1/src/event.c 2008-08-17 21:18:30.000000000 -0700
|
|
+++ libservicelog-1.0.1-new/src/event.c 2009-03-02 05:06:04.000000000 -0800
|
|
@@ -250,7 +250,7 @@ servicelog_event_log(servicelog *slog, s
|
|
if (rc != SQLITE_OK) {
|
|
snprintf(slog->error, SL_MAX_ERR, "SQL error (%d): %s",
|
|
rc, err);
|
|
- free(err);
|
|
+ sqlite3_free(err);
|
|
return 2;
|
|
}
|
|
|
|
@@ -271,7 +271,7 @@ servicelog_event_log(servicelog *slog, s
|
|
if (rc != SQLITE_OK) {
|
|
snprintf(slog->error, SL_MAX_ERR, "INSERT error (%d): "
|
|
"%s", rc, err);
|
|
- free(err);
|
|
+ sqlite3_free(err);
|
|
goto rollback;
|
|
}
|
|
|
|
@@ -292,7 +292,7 @@ servicelog_event_log(servicelog *slog, s
|
|
if (rc != SQLITE_OK) {
|
|
snprintf(slog->error, SL_MAX_ERR,
|
|
"INSERT error (%d)", rc);
|
|
- free(err);
|
|
+ sqlite3_free(err);
|
|
goto rollback;
|
|
}
|
|
}
|
|
@@ -337,7 +337,7 @@ servicelog_event_log(servicelog *slog, s
|
|
if (rc != SQLITE_OK) {
|
|
snprintf(slog->error, SL_MAX_ERR,
|
|
"INSERT error (%d): %s", rc, err);
|
|
- free(err);
|
|
+ sqlite3_free(err);
|
|
goto rollback;
|
|
}
|
|
callout = callout->next;
|
|
@@ -620,7 +620,7 @@ servicelog_event_close(servicelog *slog,
|
|
if (rc != SQLITE_OK) {
|
|
snprintf(slog->error, SL_MAX_ERR, "UPDATE error (%d): %s",
|
|
rc, err);
|
|
- free(err);
|
|
+ sqlite3_free(err);
|
|
return 2;
|
|
}
|
|
|
|
@@ -644,7 +644,7 @@ servicelog_event_repair(servicelog *slog
|
|
if (rc != SQLITE_OK) {
|
|
snprintf(slog->error, SL_MAX_ERR, "UPDATE error (%d): %s",
|
|
rc, err);
|
|
- free(err);
|
|
+ sqlite3_free(err);
|
|
return 2;
|
|
}
|
|
|
|
@@ -667,7 +667,7 @@ servicelog_event_delete(servicelog *slog
|
|
if (rc != SQLITE_OK) {
|
|
snprintf(slog->error, SL_MAX_ERR, "DELETE error (%d): %s",
|
|
rc, err);
|
|
- free(err);
|
|
+ sqlite3_free(err);
|
|
return 2;
|
|
}
|
|
|
|
diff -uNrp libservicelog-1.0.1/src/notify.c libservicelog-1.0.1-new/src/notify.c
|
|
--- libservicelog-1.0.1/src/notify.c 2008-08-18 09:22:10.000000000 -0700
|
|
+++ libservicelog-1.0.1-new/src/notify.c 2009-03-02 05:07:18.000000000 -0800
|
|
@@ -106,7 +106,7 @@ servicelog_notify_log(servicelog *slog,
|
|
if (rc != SQLITE_OK) {
|
|
snprintf(slog->error, SL_MAX_ERR, "INSERT error (%d): %s",
|
|
rc, err);
|
|
- free(err);
|
|
+ sqlite3_free(err);
|
|
return 2;
|
|
}
|
|
|
|
@@ -276,7 +276,7 @@ servicelog_notify_update(servicelog *slo
|
|
if (rc != SQLITE_OK) {
|
|
snprintf(slog->error, SL_MAX_ERR, "INSERT error (%d): %s",
|
|
rc, err);
|
|
- free(err);
|
|
+ sqlite3_free(err);
|
|
return 2;
|
|
}
|
|
|
|
@@ -301,7 +301,7 @@ servicelog_notify_delete(servicelog *slo
|
|
if (rc != SQLITE_OK) {
|
|
snprintf(slog->error, SL_MAX_ERR, "DELETE error (%d): %s",
|
|
rc, err);
|
|
- free(err);
|
|
+ sqlite3_free(err);
|
|
return 2;
|
|
}
|
|
|
|
diff -uNrp libservicelog-1.0.1/src/repair_action.c libservicelog-1.0.1-new/src/repair_action.c
|
|
--- libservicelog-1.0.1/src/repair_action.c 2008-08-01 10:16:03.000000000 -0700
|
|
+++ libservicelog-1.0.1-new/src/repair_action.c 2009-02-27 12:22:57.000000000 -0800
|
|
@@ -106,14 +106,14 @@ servicelog_repair_log(servicelog *slog,
|
|
/* update the "repair_actions" table */
|
|
snprintf(buf, 1024, "INSERT INTO repair_actions (time_repair, "
|
|
"procedure, location, platform, machine_serial, "
|
|
- "machine_model, notes) VALUES ('%s', '%s', '%s' '%s', '%s', "
|
|
+ "machine_model, notes) VALUES ('%s', '%s', '%s', '%s', '%s', "
|
|
"'%s', '%s');", timebuf, repair->procedure, repair->location,
|
|
uname_buf.machine, serialbuf, modelbuf, repair->notes);
|
|
rc = sqlite3_exec(slog->db, buf, NULL, NULL, &err);
|
|
if (rc != SQLITE_OK) {
|
|
snprintf(slog->error, SL_MAX_ERR, "INSERT error (%d): %s",
|
|
rc, err);
|
|
- free(err);
|
|
+ sqlite3_free(err);
|
|
return 2;
|
|
}
|
|
|
|
@@ -295,7 +295,7 @@ servicelog_repair_delete(servicelog *slo
|
|
if (rc != SQLITE_OK) {
|
|
snprintf(slog->error, SL_MAX_ERR, "DELETE error (%d): %s",
|
|
rc, err);
|
|
- free(err);
|
|
+ sqlite3_free(err);
|
|
return 2;
|
|
}
|
|
|