[oss-devel] C89 & BeOS/Haiku fixes

[François Revol]

Hi,
didn't try building for a while...
Here are some fixes.
- using function returned address with array subscript doesn't seem to
be C89
- some broken on beos scripts

François.

diff -r d79ebde9987e kernel/framework/audio/oss_audio_core.c
--- a/kernel/framework/audio/oss_audio_core.c   Tue Oct 07 17:50:26 2008 +0300
+++ b/kernel/framework/audio/oss_audio_core.c   Thu Oct 09 04:28:19 2008 +0200
@@ -1431,8 +1431,10 @@
 
       if ((cmd = GET_PROCESS_NAME (file)) != NULL)
        {
-         strncpy (audio_engines[dev]->cmd, cmd, 16)[15] = '\0';
-         strncpy (audio_engines[dev]->label, cmd, 16)[15] = '\0';
+         strncpy (audio_engines[dev]->cmd, cmd, 16);
+         strncpy (audio_engines[dev]->label, cmd, 16);
+         audio_engines[dev]->cmd[15] = '\0';
+         audio_engines[dev]->label[15] = '\0';
        }
       audio_engines[dev]->pid = GET_PROCESS_PID (file);
     }
diff -r d79ebde9987e kernel/framework/mixer/oss_mixer_core.c
--- a/kernel/framework/mixer/oss_mixer_core.c   Tue Oct 07 17:50:26 2008 +0300
+++ b/kernel/framework/mixer/oss_mixer_core.c   Thu Oct 09 04:28:19 2008 +0200
@@ -51,7 +51,8 @@
     return OSS_ENXIO;
 
   strcpy (info->id, mixer_devs[dev]->id);
-  strncpy (info->name, mixer_devs[dev]->name, 32)[31] = '\0';
+  strncpy (info->name, mixer_devs[dev]->name, 32);
+  info->name[31] = '\0';
   info->modify_counter = mixer_devs[dev]->modify_counter;
 
   return 0;
@@ -407,7 +408,8 @@
   if (mixer_devs[dev]->extensions[ctrl].description == NULL)
     return OSS_EIO;
 
-  strncpy (mixer_devs[dev]->extensions[ctrl].description, desc, l)[l-1] = '\0';
+  strncpy (mixer_devs[dev]->extensions[ctrl].description, desc, l);
+  mixer_devs[dev]->extensions[ctrl].description[l-1] = '\0';
 
   mixer_devs[dev]->extensions[ctrl].ext.flags |= MIXF_DESCR;
 
@@ -849,7 +851,8 @@
 
   while (*name == '.')
     name++;
-  strncpy (thisrec->extname, name, 32)[31] = '\0';
+  strncpy (thisrec->extname, name, 32);
+  thisrec->extname[31] = '\0';
 
   name = thisrec->extname;
   for (i = 0; i < strlen (name); i++)

diff -r d79ebde9987e setup/BeOS/make.local
--- a/setup/BeOS/make.local     Tue Oct 07 17:50:26 2008 +0300
+++ b/setup/BeOS/make.local     Thu Oct 09 04:28:39 2008 +0200
@@ -5,6 +5,6 @@
        cp -R prototype/* /
 
 package:       build
-               cd setup/BeOS && sh mkpkg.sh
+               sh setup/BeOS/mkpkg.sh
 
 install:       copy
diff -r d79ebde9987e setup/BeOS/mkpkg.sh
--- a/setup/BeOS/mkpkg.sh       Tue Oct 07 17:50:26 2008 +0300
+++ b/setup/BeOS/mkpkg.sh       Thu Oct 09 04:28:39 2008 +0200
@@ -6,7 +6,7 @@
 PKGNAME=$OSSNAME-$VERSION-$RELEASE
 
 echo building $PKGNAME.zip
-(cd prototype; zip -ry9 ../$PKGNAME.zip)
+(cd prototype; zip -ry9 ../$PKGNAME.zip *)
 
 #if test -f 4front-private/export_package.sh
 #then

_______________________________________________
oss-devel mailing list
oss-devel@mailman.opensound.com
http://mailman.opensound.com/mailman/listinfo/oss-devel