[68675] trunk/base/src
jmr at macports.org
jmr at macports.org
Wed Jun 9 19:04:22 PDT 2010
Revision: 68675
http://trac.macports.org/changeset/68675
Author: jmr at macports.org
Date: 2010-06-09 19:04:18 -0700 (Wed, 09 Jun 2010)
Log Message:
-----------
fix clang warnings
Modified Paths:
--------------
trunk/base/src/cregistry/entry.c
trunk/base/src/cregistry/registry.c
trunk/base/src/cregistry/sql.c
trunk/base/src/pextlib1.0/Pextlib.c
trunk/base/src/pextlib1.0/curl.c
trunk/base/src/pextlib1.0/strsed.c
trunk/base/src/pextlib1.0/xinstall.c
Modified: trunk/base/src/cregistry/entry.c
===================================================================
--- trunk/base/src/cregistry/entry.c 2010-06-09 22:43:29 UTC (rev 68674)
+++ trunk/base/src/cregistry/entry.c 2010-06-10 02:04:18 UTC (rev 68675)
@@ -197,7 +197,7 @@
*/
reg_entry* reg_entry_create(reg_registry* reg, char* name, char* version,
char* revision, char* variants, char* epoch, reg_error* errPtr) {
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
reg_entry* entry = NULL;
char* query = "INSERT INTO registry.ports "
"(name, version, revision, variants, epoch) VALUES (?, ?, ?, ?, ?)";
@@ -239,7 +239,9 @@
} else {
reg_sqlite_error(reg->db, errPtr, query);
}
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
return entry;
}
@@ -257,7 +259,7 @@
*/
reg_entry* reg_entry_open(reg_registry* reg, char* name, char* version,
char* revision, char* variants, char* epoch, reg_error* errPtr) {
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
reg_entry* entry = NULL;
char* query = "SELECT id FROM registry.ports WHERE name=? AND version=? "
"AND revision=? AND variants=? AND epoch=?";
@@ -296,7 +298,9 @@
} else {
reg_sqlite_error(reg->db, errPtr, query);
}
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
return entry;
}
@@ -312,9 +316,9 @@
int reg_entry_delete(reg_entry* entry, reg_error* errPtr) {
reg_registry* reg = entry->reg;
int result = 0;
- sqlite3_stmt* ports;
- sqlite3_stmt* files;
- sqlite3_stmt* dependencies;
+ sqlite3_stmt* ports = NULL;
+ sqlite3_stmt* files = NULL;
+ sqlite3_stmt* dependencies = NULL;
char* ports_query = "DELETE FROM registry.ports WHERE id=?";
char* files_query = "DELETE FROM registry.files WHERE id=?";
char* dependencies_query = "DELETE FROM registry.dependencies WHERE id=?";
@@ -375,9 +379,15 @@
} else {
reg_sqlite_error(reg->db, errPtr, NULL);
}
- sqlite3_finalize(ports);
- sqlite3_finalize(files);
- sqlite3_finalize(dependencies);
+ if (ports) {
+ sqlite3_finalize(ports);
+ }
+ if (files) {
+ sqlite3_finalize(files);
+ }
+ if (dependencies) {
+ sqlite3_finalize(dependencies);
+ }
return result;
}
@@ -417,7 +427,7 @@
void** results = malloc(10*sizeof(void*));
int result_count = 0;
int result_space = 10;
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
if (!results) {
return -1;
}
@@ -455,7 +465,9 @@
}
}
} else {
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
reg_sqlite_error(reg->db, errPtr, query);
}
free(results);
@@ -619,7 +631,7 @@
int reg_entry_owner(reg_registry* reg, char* path, reg_entry** entry,
reg_error* errPtr) {
int result = 0;
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
char* query = "SELECT id FROM registry.files WHERE actual_path=? AND active";
if ((sqlite3_prepare(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
&& (sqlite3_bind_text(stmt, 1, path, -1, SQLITE_STATIC)
@@ -646,7 +658,9 @@
} else {
reg_sqlite_error(reg->db, errPtr, query);
}
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
return result;
}
@@ -663,7 +677,7 @@
* @return id of owner, or 0 for none
*/
sqlite_int64 reg_entry_owner_id(reg_registry* reg, char* path) {
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
sqlite_int64 result = 0;
char* query = "SELECT id FROM registry.files WHERE actual_path=? AND active";
if ((sqlite3_prepare(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
@@ -677,7 +691,9 @@
}
} while (r == SQLITE_BUSY);
}
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
return result;
}
@@ -696,7 +712,7 @@
reg_error* errPtr) {
reg_registry* reg = entry->reg;
int result = 0;
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
char* query;
const char *text;
query = sqlite3_mprintf("SELECT %q FROM registry.ports WHERE id=%lld", key,
@@ -730,7 +746,9 @@
} else {
reg_sqlite_error(reg->db, errPtr, query);
}
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
sqlite3_free(query);
return result;
}
@@ -753,7 +771,7 @@
reg_error* errPtr) {
reg_registry* reg = entry->reg;
int result = 0;
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
char* query;
query = sqlite3_mprintf("UPDATE registry.ports SET %q = '%q' WHERE id=%lld",
key, value, entry->id);
@@ -781,7 +799,9 @@
} else {
reg_sqlite_error(reg->db, errPtr, query);
}
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
sqlite3_free(query);
return result;
}
@@ -800,7 +820,7 @@
reg_error* errPtr) {
reg_registry* reg = entry->reg;
int result = 1;
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
char* insert = "INSERT INTO registry.files (id, path, mtime, active) "
"VALUES (?, ?, 0, 0)";
if ((sqlite3_prepare(reg->db, insert, -1, &stmt, NULL) == SQLITE_OK)
@@ -833,7 +853,9 @@
reg_sqlite_error(reg->db, errPtr, insert);
result = 0;
}
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
return result;
}
@@ -851,7 +873,7 @@
reg_error* errPtr) {
reg_registry* reg = entry->reg;
int result = 1;
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
char* query = "DELETE FROM registry.files WHERE path=? AND id=?";
if ((sqlite3_prepare(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
&& (sqlite3_bind_int64(stmt, 2, entry->id) == SQLITE_OK)) {
@@ -889,7 +911,9 @@
reg_sqlite_error(reg->db, errPtr, query);
result = 0;
}
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
return result;
}
@@ -906,7 +930,7 @@
*/
int reg_entry_imagefiles(reg_entry* entry, char*** files, reg_error* errPtr) {
reg_registry* reg = entry->reg;
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
char* query = "SELECT path FROM registry.files WHERE id=? ORDER BY path";
if ((sqlite3_prepare(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
&& (sqlite3_bind_int64(stmt, 1, entry->id) == SQLITE_OK)) {
@@ -953,7 +977,9 @@
}
} else {
reg_sqlite_error(reg->db, errPtr, query);
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
return -1;
}
}
@@ -971,7 +997,7 @@
*/
int reg_entry_files(reg_entry* entry, char*** files, reg_error* errPtr) {
reg_registry* reg = entry->reg;
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
char* query = "SELECT actual_path FROM registry.files WHERE id=? "
"AND active ORDER BY actual_path";
if ((sqlite3_prepare(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
@@ -1019,7 +1045,9 @@
}
} else {
reg_sqlite_error(reg->db, errPtr, query);
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
return -1;
}
}
@@ -1043,8 +1071,8 @@
reg_registry* reg = entry->reg;
int result = 1;
int i;
- sqlite3_stmt* select;
- sqlite3_stmt* update;
+ sqlite3_stmt* select = NULL;
+ sqlite3_stmt* update = NULL;
char* select_query = "SELECT id FROM registry.files WHERE actual_path=? "
"AND active";
char* update_query = "UPDATE registry.files SET actual_path=?, active=1 "
@@ -1117,12 +1145,16 @@
reg_sqlite_error(reg->db, errPtr, update_query);
result = 0;
}
- sqlite3_finalize(update);
+ if (update) {
+ sqlite3_finalize(update);
+ }
} else {
reg_sqlite_error(reg->db, errPtr, select_query);
result = 0;
}
- sqlite3_finalize(select);
+ if (select) {
+ sqlite3_finalize(select);
+ }
return result;
}
@@ -1141,7 +1173,7 @@
reg_registry* reg = entry->reg;
int result = 1;
int i;
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
char* query = "UPDATE registry.files SET active=0 WHERE actual_path=? AND id=?";
if ((sqlite3_prepare(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
&& (sqlite3_bind_int64(stmt, 2, entry->id) == SQLITE_OK)) {
@@ -1178,7 +1210,9 @@
reg_sqlite_error(reg->db, errPtr, query);
result = 0;
}
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
return result;
}
@@ -1240,7 +1274,7 @@
int reg_entry_depends(reg_entry* entry, char* name, reg_error* errPtr) {
reg_registry* reg = entry->reg;
int result = 0;
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
char* query = "INSERT INTO registry.dependencies (id, name) VALUES (?,?)";
if ((sqlite3_prepare(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
&& (sqlite3_bind_int64(stmt, 1, entry->id) == SQLITE_OK)
@@ -1263,7 +1297,9 @@
} else {
reg_sqlite_error(reg->db, errPtr, query);
}
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
return result;
}
Modified: trunk/base/src/cregistry/registry.c
===================================================================
--- trunk/base/src/cregistry/registry.c 2010-06-09 22:43:29 UTC (rev 68674)
+++ trunk/base/src/cregistry/registry.c 2010-06-10 02:04:18 UTC (rev 68675)
@@ -194,7 +194,7 @@
}
}
if (initialized || can_write) {
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
char* query = sqlite3_mprintf("ATTACH DATABASE '%q' AS registry", path);
if (sqlite3_prepare(reg->db, query, -1, &stmt, NULL) == SQLITE_OK) {
int r;
@@ -220,7 +220,9 @@
} else {
reg_sqlite_error(reg->db, errPtr, query);
}
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
sqlite3_free(query);
} else {
reg_throw(errPtr, REG_CANNOT_INIT, "port registry doesn't exist at "
@@ -239,7 +241,7 @@
* @return true if success; false if failure
*/
int reg_detach(reg_registry* reg, reg_error* errPtr) {
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
int result = 0;
char* query = "DETACH DATABASE registry";
if (!(reg->status & reg_attached)) {
@@ -279,7 +281,9 @@
} else {
reg_sqlite_error(reg->db, errPtr, query);
}
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
return result;
}
Modified: trunk/base/src/cregistry/sql.c
===================================================================
--- trunk/base/src/cregistry/sql.c 2010-06-09 22:43:29 UTC (rev 68674)
+++ trunk/base/src/cregistry/sql.c 2010-06-10 02:04:18 UTC (rev 68675)
@@ -51,11 +51,13 @@
int do_queries(sqlite3* db, char** queries, reg_error* errPtr) {
char** query;
for (query = queries; *query != NULL; query++) {
- sqlite3_stmt* stmt;
+ sqlite3_stmt* stmt = NULL;
if ((sqlite3_prepare(db, *query, -1, &stmt, NULL) != SQLITE_OK)
|| (sqlite3_step(stmt) != SQLITE_DONE)) {
reg_sqlite_error(db, errPtr, *query);
- sqlite3_finalize(stmt);
+ if (stmt) {
+ sqlite3_finalize(stmt);
+ }
return 0;
}
sqlite3_finalize(stmt);
Modified: trunk/base/src/pextlib1.0/Pextlib.c
===================================================================
--- trunk/base/src/pextlib1.0/Pextlib.c 2010-06-09 22:43:29 UTC (rev 68674)
+++ trunk/base/src/pextlib1.0/Pextlib.c 2010-06-10 02:04:18 UTC (rev 68675)
@@ -94,10 +94,10 @@
{
char *d, *dest;
const char *s;
- int slen, dlen;
+ size_t dlen;
s = source;
- slen = dlen = strlen(source) * 2 + 1;
+ dlen = strlen(source) * 2 + 1;
d = dest = malloc(dlen);
if (dest == NULL) {
return NULL;
@@ -132,8 +132,9 @@
{
const char ui_proc_start[] = "ui_info [subst -nocommands -novariables {";
const char ui_proc_end[] = "}]";
- char *script, *string, *p;
- int scriptlen, len, rval;
+ char *script, *string;
+ size_t scriptlen, len, remaining;
+ int rval;
string = ui_escape(mesg);
if (string == NULL)
@@ -144,14 +145,14 @@
script = malloc(scriptlen);
if (script == NULL)
return TCL_ERROR;
- else
- p = script;
memcpy(script, ui_proc_start, sizeof(ui_proc_start));
- strcat(script, string);
- strcat(script, ui_proc_end);
+ remaining = scriptlen - sizeof(ui_proc_start);
+ strncat(script, string, remaining);
+ remaining -= len;
+ strncat(script, ui_proc_end, remaining);
free(string);
- rval = Tcl_EvalEx(interp, script, scriptlen - 1, 0);
+ rval = Tcl_EvalEx(interp, script, -1, 0);
free(script);
return rval;
}
Modified: trunk/base/src/pextlib1.0/curl.c
===================================================================
--- trunk/base/src/pextlib1.0/curl.c 2010-06-09 22:43:29 UTC (rev 68674)
+++ trunk/base/src/pextlib1.0/curl.c 2010-06-10 02:04:18 UTC (rev 68675)
@@ -398,7 +398,7 @@
if (remotetime) {
theCurlCode = curl_easy_getinfo(theHandle, CURLINFO_FILETIME, &theFileTime);
- if (theFileTime > 0) {
+ if (theCurlCode == CURLE_OK && theFileTime > 0) {
struct utimbuf times;
times.actime = (time_t)theFileTime;
times.modtime = (time_t)theFileTime;
Modified: trunk/base/src/pextlib1.0/strsed.c
===================================================================
--- trunk/base/src/pextlib1.0/strsed.c 2010-06-09 22:43:29 UTC (rev 68674)
+++ trunk/base/src/pextlib1.0/strsed.c 2010-06-10 02:04:18 UTC (rev 68675)
@@ -592,6 +592,12 @@
*/
do {
+#ifdef HS_REGEX
+ /* XXX Not even trying to use custom memory routines */
+ if (!(exp_regs = calloc(str_len, sizeof(regmatch_t)))) {
+ return 0;
+ }
+#endif
if (match_all){
/* Fake a match instead of calling re_search() or regexec(). */
match = 1;
@@ -605,10 +611,6 @@
match = re_search(&re_comp_buf, str, str_len, 0, str_len, ®s);
#endif
#ifdef HS_REGEX
- /* XXX Not even trying to use custom memory routines */
- if (!(exp_regs = calloc(str_len, sizeof(regmatch_t)))) {
- return 0;
- }
match = regexec(&exp, str, str_len, exp_regs, 0) ? NO_MATCH : 1;
#endif
}
Modified: trunk/base/src/pextlib1.0/xinstall.c
===================================================================
--- trunk/base/src/pextlib1.0/xinstall.c 2010-06-09 22:43:29 UTC (rev 68674)
+++ trunk/base/src/pextlib1.0/xinstall.c 2010-06-10 02:04:18 UTC (rev 68675)
@@ -146,7 +146,7 @@
{
struct stat from_sb, to_sb;
mode_t *set;
- u_long fset;
+ u_long fset = 0;
int no_target, rval;
u_int iflags;
char *flags, *curdir;
@@ -1026,6 +1026,7 @@
if (wait(&status) == -1 || status) {
serrno = errno;
(void)unlink(to_name);
+ errno = serrno;
return;
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100609/4c482c35/attachment-0001.html>
More information about the macports-changes
mailing list