Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/src
Modified Files:
array.c dlinked_list.c linked_list.c socket.c url.c
Log Message:
Wed Feb 4 10:53:04 2004 Michael Jennings (mej)
Should be all fixed now.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/array.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- array.c 2 Feb 2004 22:21:21 -0000 1.15
+++ array.c 4 Feb 2004 17:51:23 -0000 1.16
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: array.c,v 1.15 2004/02/02 22:21:21 mej Exp $";
+static const char cvs_ident[] = "$Id: array.c,v 1.16 2004/02/04 17:51:23 mej Exp $";
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -421,7 +421,7 @@
if (idx < 0) {
idx += self->len;
}
- return (((idx > 0) && (idx < self->len)) ? (self->items[idx]) :
(SPIF_NULL_TYPE(obj)));
+ return (((idx >= 0) && (idx < self->len)) ? (self->items[idx]) :
(SPIF_NULL_TYPE(obj)));
}
static spif_listidx_t
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/dlinked_list.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- dlinked_list.c 3 Feb 2004 23:16:59 -0000 1.18
+++ dlinked_list.c 4 Feb 2004 17:51:26 -0000 1.19
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: dlinked_list.c,v 1.18 2004/02/03 23:16:59 mej
Exp $";
+static const char cvs_ident[] = "$Id: dlinked_list.c,v 1.19 2004/02/04 17:51:26 mej
Exp $";
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -558,7 +558,7 @@
spif_dlinked_list_item_t current;
ASSERT_RVAL(!SPIF_LIST_ISNULL(self), SPIF_CAST(listidx) -1);
- for (current = self->head, i = 0; current &&
!SPIF_CMP_IS_EQUAL(SPIF_OBJ_COMP(current->data, obj)); i++, current = current->next);
+ for (current = self->head, i = 0; current &&
!SPIF_CMP_IS_EQUAL(SPIF_OBJ_COMP(obj, current->data)); i++, current = current->next);
return (current ? i : ((spif_listidx_t) (-1)));
}
@@ -605,7 +605,7 @@
/* Negative indexes go backward from the end of the list. */
idx += self->len;
}
- REQUIRE_RVAL((idx + 1) >= 0, FALSE);
+ REQUIRE_RVAL((idx + 1) > 0, FALSE);
if (idx == 0 || SPIF_DLINKED_LIST_ITEM_ISNULL(self->head)) {
return spif_dlinked_list_prepend(self, obj);
@@ -745,7 +745,7 @@
}
tmp = spif_dlinked_list_item_get_data(current);
- spif_dlinked_list_item_set_data(current, SPIF_NULL_TYPE(obj));
+ current->data = SPIF_NULL_TYPE(obj);
spif_dlinked_list_item_del(current);
self->len--;
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/linked_list.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- linked_list.c 3 Feb 2004 23:16:59 -0000 1.21
+++ linked_list.c 4 Feb 2004 17:51:26 -0000 1.22
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: linked_list.c,v 1.21 2004/02/03 23:16:59 mej
Exp $";
+static const char cvs_ident[] = "$Id: linked_list.c,v 1.22 2004/02/04 17:51:26 mej
Exp $";
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -460,7 +460,7 @@
} else {
self->head = item;
}
- item->next = SPIF_NULL_TYPE(linked_list_item);
+
self->len++;
return TRUE;
}
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/socket.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- socket.c 3 Feb 2004 23:17:00 -0000 1.17
+++ socket.c 4 Feb 2004 17:51:26 -0000 1.18
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: socket.c,v 1.17 2004/02/03 23:17:00 mej Exp $";
+static const char cvs_ident[] = "$Id: socket.c,v 1.18 2004/02/04 17:51:26 mej Exp $";
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -263,7 +263,11 @@
/* Get remote address, if we have one. */
if (SPIF_SOCKET_FLAGS_IS_SET(self, SPIF_SOCKET_FLAGS_FAMILY_INET)) {
self->fam = AF_INET;
- self->addr = SPIF_CAST(sockaddr) spif_url_get_ipaddr(self->remote_url);
+ if (!SPIF_URL_ISNULL(self->remote_url)) {
+ self->addr = SPIF_CAST(sockaddr)
spif_url_get_ipaddr(self->remote_url);
+ } else {
+ self->addr = SPIF_NULL_TYPE(sockaddr);
+ }
if (self->addr == SPIF_NULL_TYPE(sockaddr)) {
self->len = 0;
} else {
@@ -271,7 +275,11 @@
}
} else if (SPIF_SOCKET_FLAGS_IS_SET(self, SPIF_SOCKET_FLAGS_FAMILY_UNIX)) {
self->fam = AF_UNIX;
- self->addr = SPIF_CAST(sockaddr) spif_url_get_unixaddr(self->remote_url);
+ if (!SPIF_URL_ISNULL(self->remote_url)) {
+ self->addr = SPIF_CAST(sockaddr)
spif_url_get_unixaddr(self->remote_url);
+ } else {
+ self->addr = SPIF_NULL_TYPE(sockaddr);
+ }
if (self->addr == SPIF_NULL_TYPE(sockaddr)) {
self->len = 0;
} else {
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/src/url.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- url.c 3 Feb 2004 23:17:00 -0000 1.16
+++ url.c 4 Feb 2004 17:51:26 -0000 1.17
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: url.c,v 1.16 2004/02/03 23:17:00 mej Exp $";
+static const char cvs_ident[] = "$Id: url.c,v 1.17 2004/02/04 17:51:26 mej Exp $";
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -231,13 +231,41 @@
ASSERT_RVAL(!SPIF_URL_ISNULL(self), SPIF_NULL_TYPE(url));
tmp = spif_url_new_from_str(SPIF_STR(self));
- tmp->proto = spif_str_dup(self->proto);
- tmp->user = spif_str_dup(self->user);
- tmp->passwd = spif_str_dup(self->passwd);
- tmp->host = spif_str_dup(self->host);
- tmp->port = spif_str_dup(self->port);
- tmp->path = spif_str_dup(self->path);
- tmp->query = spif_str_dup(self->query);
+ if (SPIF_STR_ISNULL(self->proto)) {
+ tmp->proto = SPIF_NULL_TYPE(str);
+ } else {
+ tmp->proto = spif_str_dup(self->proto);
+ }
+ if (SPIF_STR_ISNULL(self->user)) {
+ tmp->user = SPIF_NULL_TYPE(str);
+ } else {
+ tmp->user = spif_str_dup(self->user);
+ }
+ if (SPIF_STR_ISNULL(self->passwd)) {
+ tmp->passwd = SPIF_NULL_TYPE(str);
+ } else {
+ tmp->passwd = spif_str_dup(self->passwd);
+ }
+ if (SPIF_STR_ISNULL(self->host)) {
+ tmp->host = SPIF_NULL_TYPE(str);
+ } else {
+ tmp->host = spif_str_dup(self->host);
+ }
+ if (SPIF_STR_ISNULL(self->port)) {
+ tmp->port = SPIF_NULL_TYPE(str);
+ } else {
+ tmp->port = spif_str_dup(self->port);
+ }
+ if (SPIF_STR_ISNULL(self->path)) {
+ tmp->path = SPIF_NULL_TYPE(str);
+ } else {
+ tmp->path = spif_str_dup(self->path);
+ }
+ if (SPIF_STR_ISNULL(self->query)) {
+ tmp->query = SPIF_NULL_TYPE(str);
+ } else {
+ tmp->query = spif_str_dup(self->query);
+ }
return tmp;
}
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
