Changeset 121 for pjproject/trunk/pjmedia/src/pjmedia/sdp.c

Timestamp:

Jan 18, 2006 11:12:57 PM (18 years ago)

Author:

bennylp

Message:

Compiled cleanly first time for the new pjlib

File:

• pjproject/trunk/pjmedia/src/pjmedia/sdp.c (modified) (13 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sdp.c

@@ -18 +18 @@
  */
 #include <pjmedia/sdp.h>
-#include <pj/scanner.h>
+#include <pjlib-util/scanner.h>
 #include <pj/except.h>
 #include <pj/log.h>
@@ -24 +24 @@
 #include <pj/string.h>
 #include <pj/pool.h>
+#include <pj/assert.h>
 
 enum {
@@ -124 +125 @@
  */
 static int is_initialized;
-static pj_char_spec cs_token;
+static pj_cis_buf_t cis_buf;
+static pj_cis_t cs_token;
 
 static void init_sdp_parser(void)
@@ -134 +136 @@
         }
     }
-    pj_cs_add_alpha(cs_token);
-    pj_cs_add_num(cs_token);
-    pj_cs_add_str( cs_token, TOKEN);
+
+    pj_cis_buf_init(&cis_buf);
+    pj_cis_init(&cis_buf, &cs_token);
+    pj_cis_add_alpha(&cs_token);
+    pj_cis_add_num(&cs_token);
+    pj_cis_add_str(&cs_token, TOKEN);
 }
 
@@ -203 +208 @@
 static int print_name_only_attr(const pjsdp_attr *attr, char *buf, int len)
 {
-    PJ_UNUSED_ARG(attr)
-    PJ_UNUSED_ARG(buf)
-    PJ_UNUSED_ARG(len)
+    PJ_UNUSED_ARG(attr);
+    PJ_UNUSED_ARG(buf);
+    PJ_UNUSED_ARG(len);
     return 0;
 }
@@ -707 +712 @@
 
     /* port */
-    pj_scan_get(scanner, cs_token, &str);
+    pj_scan_get(scanner, &cs_token, &str);
     med->desc.port = (unsigned short)pj_strtoul(&str);
-    if (*scanner->current == '/') {
+    if (*scanner->curptr == '/') {
         /* port count */
         pj_scan_get_char(scanner);
-        pj_scan_get(scanner, cs_token, &str);
+        pj_scan_get(scanner, &cs_token, &str);
         med->desc.port_count = pj_strtoul(&str);
 
@@ -728 +733 @@
     /* format list */
     med->desc.fmt_count = 0;
-    while (*scanner->current == ' ') {
+    while (*scanner->curptr == ' ') {
         pj_scan_get_char(scanner);
-        pj_scan_get(scanner, cs_token, &med->desc.fmt[med->desc.fmt_count++]);
+        pj_scan_get(scanner, &cs_token, &med->desc.fmt[med->desc.fmt_count++]);
     }
 
@@ -752 +757 @@
     pj_scan_get_until_ch(scanner, '/', &rtpmap->encoding_name);
     pj_scan_get_char(scanner);
-    pj_scan_get(scanner, cs_token, &str);
+    pj_scan_get(scanner, &cs_token, &str);
     rtpmap->clock_rate = pj_strtoul(&str);
 
-    if (*scanner->current == '/') {
+    if (*scanner->curptr == '/') {
         pj_scan_get_char(scanner);
         pj_scan_get_until_ch(scanner, '\r', &rtpmap->parameter);
@@ -794 +799 @@
     pjsdp_attr *attr;
 
-    PJ_UNUSED_ARG(scanner)
+    PJ_UNUSED_ARG(scanner);
     attr = pj_pool_calloc(pool, 1, sizeof(*attr));
     return attr;
@@ -825 +830 @@
     
     /* get attr name. */
-    pj_scan_get(scanner, cs_token, &attrname);
+    pj_scan_get(scanner, &cs_token, &attrname);
 
     /* find entry to handle attrname */
@@ -852 +857 @@
 static void on_scanner_error(pj_scanner *scanner)
 {
-    PJ_UNUSED_ARG(scanner)
+    PJ_UNUSED_ARG(scanner);
 
     PJ_THROW(SYNTAX_ERROR);
@@ -879 +884 @@
     PJ_TRY {
         while (!pj_scan_is_eof(&scanner)) {
-                cur_name = *scanner.current;
+                cur_name = *scanner.curptr;
                 switch (cur_name) {
                 case 'a':
@@ -925 +930 @@
     PJ_CATCH(SYNTAX_ERROR) {
         PJ_LOG(2, (LOG_THIS, "Syntax error in SDP parser '%c' line %d col %d",
-                cur_name, scanner.line, scanner.col));
+                cur_name, scanner.line, pj_scan_get_col(&scanner)));
         if (!pj_scan_is_eof(&scanner)) {
-            if (*scanner.current != '\r') {
+            if (*scanner.curptr != '\r') {
                 pj_scan_get_until_ch(&scanner, '\r', &dummy);
             }