[Simplemail-cvs] simplemail imap.c, 1.93, 1.94 index_external.c, 1.53, 1.54 pop3.c, 1.107, 1.108

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12393

Modified Files:
	imap.c index_external.c pop3.c 
Log Message:
Improved SAS/C compability.


Index: imap.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/imap.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- imap.c	21 Feb 2014 06:39:08 -0000	1.93
+++ imap.c	22 Feb 2014 09:40:57 -0000	1.94
@@ -1104,7 +1104,7 @@
 		for( ;server; server = (struct imap_server*)node_next(&server->node))
 		{
 			struct connection *conn;
-			struct connect_options conn_opts = {};
+			struct connect_options conn_opts = {0};
 			char head_buf[100];
 
 			SM_DEBUGF(10,("Synchronizing with server \"%s\"\n",server->name));
@@ -1221,7 +1221,7 @@
 	if (open_socket_lib())
 	{
 		struct connection *conn;
-		struct connect_options conn_opts = {};
+		struct connect_options conn_opts = {0};
 		char head_buf[100];
 
 		sprintf(head_buf,_("Reading folders of %s"),server->name);
@@ -1302,7 +1302,7 @@
 	if (open_socket_lib())
 	{
 		struct connection *conn;
-		struct connect_options conn_opts = {};
+		struct connect_options conn_opts = {0};
 		char head_buf[100];
 
 		sm_snprintf(head_buf,sizeof(head_buf),_("Submitting subscribed folders to %s"),server->name);
@@ -1864,7 +1864,7 @@
 	if (imap_server)
 	{
 		char status_buf[160];
-		struct connect_options conn_opts = {};
+		struct connect_options conn_opts = {0};
 
 		if (!imap_socket_lib_open)
 		 imap_socket_lib_open = open_socket_lib();

Index: pop3.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/pop3.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- pop3.c	21 Feb 2014 06:39:08 -0000	1.107
+++ pop3.c	22 Feb 2014 09:40:57 -0000	1.108
@@ -941,7 +941,7 @@
 		for (;server; server = (struct pop3_server*)node_next(&server->node))
 		{
 			struct connection *conn;
-			struct connect_options connect_options = {};
+			struct connect_options connect_options = {0};
 			char head_buf[100];
 
 			rc = 0;
@@ -1173,7 +1173,7 @@
 	if (open_socket_lib())
 	{
 		struct connection *conn;
-		struct connect_options conn_opts = {};
+		struct connect_options conn_opts = {0};
 
 		conn_opts.use_ssl = server->ssl && (!server->stls);
 

Index: index_external.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail/index_external.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- index_external.c	21 Feb 2014 06:31:22 -0000	1.53
+++ index_external.c	22 Feb 2014 09:40:57 -0000	1.54
@@ -512,7 +512,7 @@
 	bnode *tmp = bnode_create(idx);
 
 	if (!bnode_read_block(idx, tmp, block))
-		return;
+		return 0;
 
 	if (!tmp->leaf)
 		count += count_index(idx, tmp->lchild, level + 1);
@@ -618,6 +618,8 @@
 
 		if (tmp->num_elements == idx->max_elements_per_node)
 		{
+			int tmp3block;
+
 			/* Now we split the node into two nodes. We keep the median in but also
 			 * insert it as a separation value for the two nodes on the parent.
 			 */
@@ -637,7 +639,7 @@
 			idx->tmp3->sibling = tmp->sibling;
 			memcpy(bnode_get_ith_element_of_node(idx, idx->tmp3, 0), bnode_get_ith_element_of_node(idx, tmp, start_of_2nd_node), idx->tmp3->num_elements * sizeof(struct bnode_element));
 			bnode_clear_elements(idx, idx->tmp3, idx->tmp3->num_elements);
-			int tmp3block = bnode_add_block(idx, idx->tmp3);
+			tmp3block = bnode_add_block(idx, idx->tmp3);
 
 			/* This should be done as late as possible */
 			tmp->sibling = tmp3block;