Răsfoiți Sursa

renamed function for route serialization,
PIDF parser accepts case insensitive basic status names

Vaclav Kubart 19 ani în urmă
părinte
comite
8191f4d5d2
3 a modificat fișierele cu 4 adăugiri și 4 ștergeri
  1. 1 1
      lib/cds/rr_serialize.c
  2. 1 1
      lib/cds/rr_serialize.h
  3. 2 2
      lib/presence/pidf.c

+ 1 - 1
lib/cds/rr_serialize.c

@@ -19,7 +19,7 @@ static void rr_dup(rr_t **dst, rr_t *pkg_rr)
 	if (tmp) free_rr(&tmp);
 }
 
-int serialize_route(sstream_t *ss, rr_t **_r)
+static int serialize_route(sstream_t *ss, rr_t **_r)
 {
 	int do_it = 0;
 	int res = 0;

+ 1 - 1
lib/cds/rr_serialize.h

@@ -8,7 +8,7 @@
 #include <cds/serialize.h>
 #include <parser/parse_rr.h>
 
-int serialize_route(sstream_t *ss, rr_t **_r);
+int serialize_route_set(sstream_t *ss, rr_t **_r);
 int route_set2str(rr_t *rr, str_t *dst_str);
 int str2route_set(const str_t *s, rr_t **rr);
 

+ 2 - 2
lib/presence/pidf.c

@@ -374,8 +374,8 @@ static int read_tuple(xmlNode *tuple, presence_tuple_info_t **dst, int ignore_ns
 
 	/* translate status */
 	status = presence_tuple_closed; /* default value */
-	if (strcmp(s, "open") == 0) status = presence_tuple_open;
-	if (strcmp(s, "closed") == 0) status = presence_tuple_closed;
+	if (strcasecmp(s, "open") == 0) status = presence_tuple_open;
+	if (strcasecmp(s, "closed") == 0) status = presence_tuple_closed;
 	/* FIXME: handle not standardized variants too (add note to basic status) */
 	
 	/* get ID from tuple node attribute? */