make comments that are not on the beginning of the line require a double char ;;...

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@236 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/freetdm/src/zap_analog.c b/libs/freetdm/src/zap_analog.c
index 7290d38d88c03cc37e34762d528ea136309d53b0..eb4337b156aec43fcad1fe97983b1bb37771403a 100644 (file)
--- a/libs/freetdm/src/zap_analog.c
+++ b/libs/freetdm/src/zap_analog.c
@@ -143,7 +143,10 @@ static void *zap_analog_channel_run(zap_thread_t *me, void *obj)
        zap_set_flag_locked(chan, ZAP_CHANNEL_INTHREAD);
        teletone_init_session(&ts, 0, teletone_handler, dt_buffer);
        ts.rate = 8000;
-
+#if 0
+       ts.debug = 1;
+       ts.debug_stream = stdout;
+#endif
        zap_channel_command(chan, ZAP_COMMAND_GET_INTERVAL, &interval);
        zap_buffer_set_loops(dt_buffer, -1);
        

diff --git a/libs/freetdm/src/zap_config.c b/libs/freetdm/src/zap_config.c
index e4d4116244e5b3d93d07180a93d9753835f6c168..59745748055d72f399b4f1f8ace0ac2897e0e7fc 100644 (file)
--- a/libs/freetdm/src/zap_config.c
+++ b/libs/freetdm/src/zap_config.c
@@ -157,7 +157,7 @@ int zap_config_next_pair(zap_config_t *cfg, char **var, char **val)
                }
 
 
-               if ((end = strchr(*var, '#')) != 0 || (end = strchr(*var, ';')) != 0) {
+               if (((end = strchr(*var, '#')) || (end = strchr(*var, ';'))) && *(end+1) == *end) {
                        *end = '\0';
                        end--;
                } else if ((end = strchr(*var, '\n')) != 0) {