tests/pdtest: Small fix to make it work with Python 3.2.

[libsigrokdecode.git] / srd.c

diff --git a/srd.c b/srd.c
index b74b780ebf75e70397bd2c50efc03d2c98c14e7e..097ed29a5ac8368c5cd83af71849a2fe515b7168 100644 (file)
--- a/srd.c
+++ b/srd.c
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "libsigrokdecode-internal.h"
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"

 #include "config.h"
 #include <glib.h>
 
 #include "config.h"
 #include <glib.h>
 


@@ -29,11 +29,8 @@
 SRD_PRIV GSList *searchpaths = NULL;
 
 /* session.c */
 SRD_PRIV GSList *searchpaths = NULL;
 
 /* session.c */

-extern GSList *sessions;
-extern int max_session_id;
-
-/* decoder.c */
-extern SRD_PRIV GSList *pd_list;
+extern SRD_PRIV GSList *sessions;
+extern SRD_PRIV int max_session_id;

 
 /** @endcond */
 
 
 /** @endcond */
 


@@ -65,7 +62,7 @@ extern SRD_PRIV GSList *pd_list;
  *
  * @section sec_mailinglists Mailing lists
  *
  *
  * @section sec_mailinglists Mailing lists
  *

- * There are two mailing lists for sigrok/libsigrokdecode: <a href="https://lists.sourceforge.net/lists/listinfo/sigrok-devel">sigrok-devel</a> and <a href="https://lists.sourceforge.net/lists/listinfo/sigrok-commits">sigrok-commits</a>.
+ * There is one mailing list for sigrok/libsigrokdecode: <a href="https://lists.sourceforge.net/lists/listinfo/sigrok-devel">sigrok-devel</a>.

  *
  * @section sec_irc IRC
  *
  *
  * @section sec_irc IRC
  *


@@ -264,14 +261,4 @@ SRD_PRIV int srd_decoder_searchpath_add(const char *path)
        return SRD_OK;
 }
 
        return SRD_OK;
 }
 

-/** @private */
-SRD_PRIV gboolean srd_check_init(void)
-{
-       if (max_session_id < 0) {
-               srd_err("Library is not initialized.");
-               return FALSE;
-       } else
-               return TRUE;
-}
-

 /** @} */
 /** @} */