Changeset: e19a2741b0d8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e19a2741b0d8
Modified Files:
clients/src/mapilib/Mapi.mx
sql/src/backends/monet5/merovingian/merovingian_forkmserver.c
Branch: Jun2010
Log Message:
fixed compilation with icc:
avoid
"
.../clients/src/mapilib/Mapi.mx(2342): error #592: variable "s" is used before
its value is set
struct sockaddr_un s; /* just for sizeof(s.sun_path) */ (void)s;
^
"
and
"
.../sql/src/backends/monet5/merovingian/merovingian_forkmserver.c(279): error
#592: variable "s" is used before its value is set
struct sockaddr_un s; /* only for sizeof(s.sun_path) :(
*/ (void)s;
^
"
by removing non-required "(void)s;"
No "fake use" is required, as the variable is actually used in the sizeof()
statement.
diffs (24 lines):
diff -r 75c700a89bba -r e19a2741b0d8 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Tue Jul 27 08:25:59 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Tue Jul 27 08:52:30 2010 +0200
@@ -2339,7 +2339,7 @@
#ifdef HAVE_SYS_UN_H
if (mid->hostname == NULL) {
struct stat st;
- struct sockaddr_un s; /* just for sizeof(s.sun_path) */ (void)s;
+ struct sockaddr_un s; /* just for sizeof(s.sun_path) */
snprintf(errbuf, sizeof(errbuf),
CLIENTS_PREFIX "/var/MonetDB5/dbfarm/mapi_socket");
if (strlen(errbuf) <= sizeof(s.sun_path) &&
diff -r 75c700a89bba -r e19a2741b0d8
sql/src/backends/monet5/merovingian/merovingian_forkmserver.c
--- a/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Tue Jul
27 08:25:59 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Tue Jul
27 08:52:30 2010 +0200
@@ -276,7 +276,7 @@
argv[c++] = dbname;
argv[c++] = "--set"; argv[c++] = muri;
if (mydoproxy == 1) {
- struct sockaddr_un s; /* only for sizeof(s.sun_path) :(
*/ (void)s;
+ struct sockaddr_un s; /* only for sizeof(s.sun_path) :(
*/
argv[c++] = "--set"; argv[c++] = "mapi_open=false";
/* we "proxy", so we can just solely use UNIX domain
sockets
* internally. Before we hit our head, check if we can
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
