Got rid of obsolete error codes.

diff --git a/lib/error.c b/lib/error.c
index 96a73fc026bbe41540b35b951344a65ff2751c5a..2f55e1f0a1e9b81faf7680563b3eea5acec25b2f 100644 (file)
--- a/lib/error.c
+++ b/lib/error.c
@@ -98,7 +98,7 @@ void internal_error(int err)
 int valid_dev(comedi_t *it)
 {
        if(!it || it->magic!=COMEDILIB_MAGIC){
-               internal_error(COMEDILIB_BADDEV);
+               internal_error(EBAD_CT);
                return 0;
        }
        
@@ -109,7 +109,7 @@ int valid_subd(comedi_t *it,unsigned int subd)
 {
        if(!valid_dev(it))return 0;
        if(subd>=it->n_subdevices){
-               internal_error(COMEDILIB_BADSUBD);
+               internal_error(EINVAL_SUBD);
                return 0;
        }
        
@@ -120,7 +120,7 @@ int valid_chan(comedi_t *it,unsigned int subd,unsigned int chan)
 {
        if(!valid_subd(it,subd))return 0;
        if(chan>=it->subdevices[subd].n_chan){
-               internal_error(COMEDILIB_BADCHAN);
+               internal_error(EINVAL_CHAN);
                return 0;
        }
        

diff --git a/lib/libinternal.h b/lib/libinternal.h
index 27228163f82148b5c119be4d483d9729b57f71f7..d260c00873be906d92f56dd1f1050ef699e65595 100644 (file)
--- a/lib/libinternal.h
+++ b/lib/libinternal.h
@@ -141,14 +141,6 @@ int valid_dev(comedi_t *it);
 int valid_subd(comedi_t *it,unsigned int subdevice);
 int valid_chan(comedi_t *it,unsigned int subdevice,unsigned int chan);
 
-enum{
-       COMEDILIB_NOERROR = 0x1000,
-       COMEDILIB_UNKNOWN,
-       COMEDILIB_BADDEV,
-       COMEDILIB_BADSUBD,
-       COMEDILIB_BADCHAN,
-};
-
 /* used by range.c, was in comedilib.h but apparently deprecated so I put it here - fmhess */
 int comedi_get_rangetype(comedi_t *it,unsigned int subdevice,unsigned int chan);