Update of /cvsroot/alsa/alsa-driver/utils
In directory sc8-pr-cvs1:/tmp/cvs-serv8790

Modified Files:
        alsaconf 
Log Message:
fixed error messages during building database.



Index: alsaconf
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/utils/alsaconf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- alsaconf    17 Jul 2003 18:14:28 -0000      1.7
+++ alsaconf    8 Sep 2003 14:49:38 -0000       1.8
@@ -119,7 +119,7 @@
 fi
 
 alsa_device_opts=""
-if modinfo -p snd | grep uid ; then
+if modinfo -p snd | grep -q uid ; then
   if [ x"$alsa_uid" != x0 ]; then
     alsa_device_opts="$alsa_device_opts ${mpfx}device_uid=$alsa_uid"
   fi
@@ -127,7 +127,7 @@
     alsa_device_opts="$alsa_device_opts ${mpfx}device_gid=$alsa_gid"
   fi
 fi
-if modinfo -p snd | grep device_mode ; then
+if modinfo -p snd | grep -q device_mode ; then
   if [ x"$alsa_mode" != x0 ]; then
     alsa_device_opts="$alsa_device_opts ${mpfx}device_mode=$alsa_mode"
   fi
@@ -343,6 +343,10 @@
 
 # convert ISA PnP id number to string 'ABC'
 convert_isapnp_id () {
+    if [ -z "$1" ]; then
+       echo "XXXX"
+       return
+    fi
     let a='('$1'>>2) & 0x3f'
     let b='(('$1' & 0x03) << 3) | (('$1' >> 13) & 0x07)'
     let c='('$1'>> 8) & 0x1f'
@@ -352,6 +356,10 @@
 
 # swap high & low bytes
 swap_number () {
+    if [ -z "$1" ]; then
+       echo "0000"
+       return
+    fi
     let v='(('$1'>>8)&0xff)|(('$1'&0xff)<<8)'
     printf "%04x" $v
 }



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to