[freesci-develop] r1523 - in freesci/trunk: . src/engine src/scicore

[jameson]

Author: jameson
Date: 2006-02-06 02:49:46 +0100 (Mon, 06 Feb 2006)
New Revision: 1523

Modified:
   freesci/trunk/ChangeLog
   freesci/trunk/config.log
   freesci/trunk/src/engine/kscripts.c
   freesci/trunk/src/scicore/resource.c
Log:
* Resource manager unlock function: Parameter swapping fixed

Double-checking by Matt.

-- Christoph



Modified: freesci/trunk/ChangeLog
===================================================================
--- freesci/trunk/ChangeLog     2006-02-05 09:52:31 UTC (rev 1522)
+++ freesci/trunk/ChangeLog     2006-02-06 01:49:46 UTC (rev 1523)
@@ -15,6 +15,9 @@
 
 2006-02-05  Christoph Reichenbach  <address@hidden>
 
+       * src/scicore/resource.c (scir_unlock_resource): Swapped
+       parameters to correspond to prototype.
+
        * src/sound/pcmout_alsa.c: ALSA pcmout now has a 'device'
        parameter (default is still "hw:0,0")
 

Modified: freesci/trunk/config.log
===================================================================
--- freesci/trunk/config.log    2006-02-05 09:52:31 UTC (rev 1522)
+++ freesci/trunk/config.log    2006-02-06 01:49:46 UTC (rev 1523)
@@ -503,8 +503,8 @@
 configure:6255: result: yes
 configure:6168: checking for memf
 configure:6225: gcc -o conftest -g -O2   conftest.c  >&5
-/tmp/ccWaWYwK.o: In function 
`main':/home/creichen/work/port/freesci/conftest.c:80: undefined reference to 
`memf'
-/tmp/ccWaWYwK.o:(.data+0x0): undefined reference to `memf'
+/tmp/cccbLf2i.o: In function 
`main':/home/creichen/work/port/tmp/trunk/conftest.c:80: undefined reference to 
`memf'
+/tmp/cccbLf2i.o:(.data+0x0): undefined reference to `memf'
 collect2: ld returned 1 exit status
 configure:6231: $? = 1
 configure: failed program was:
@@ -595,8 +595,8 @@
 configure:6255: result: no
 configure:6168: checking for rob
 configure:6225: gcc -o conftest -g -O2   conftest.c  >&5
-/tmp/ccUPN9IV.o: In function 
`main':/home/creichen/work/port/freesci/conftest.c:80: undefined reference to 
`rob'
-/tmp/ccUPN9IV.o:(.data+0x0): undefined reference to `rob'
+/tmp/ccir3LMe.o: In function 
`main':/home/creichen/work/port/tmp/trunk/conftest.c:80: undefined reference to 
`rob'
+/tmp/ccir3LMe.o:(.data+0x0): undefined reference to `rob'
 collect2: ld returned 1 exit status
 configure:6231: $? = 1
 configure: failed program was:
@@ -779,7 +779,7 @@
 configure:6763: gcc -E   conftest.c
 configure:6769: $? = 0
 configure:6828: gcc -o conftest -g -O2    -lgii -lgg   conftest.c -lasound  
-lasound -lm  >&5
-/tmp/ccaek9qY.o: In function 
`main':/home/creichen/work/port/freesci/conftest.c:54: undefined reference to 
`ggiInit'
+/tmp/ccI4XtnK.o: In function 
`main':/home/creichen/work/port/tmp/trunk/conftest.c:54: undefined reference to 
`ggiInit'
 collect2: ld returned 1 exit status
 configure:6834: $? = 1
 configure: failed program was:
@@ -2106,7 +2106,7 @@
 configure:8178: gcc -E   conftest.c
 configure:8184: $? = 0
 configure:8244: gcc -o conftest -g -O2      conftest.c -lasound  -lasound -lm  
>&5
-/tmp/cccO7xjD.o: In function 
`main':/home/creichen/work/port/freesci/conftest.c:56: undefined reference to 
`noecho'
+/tmp/ccdRz5ul.o: In function 
`main':/home/creichen/work/port/tmp/trunk/conftest.c:56: undefined reference to 
`noecho'
 collect2: ld returned 1 exit status
 configure:8250: $? = 1
 configure: failed program was:
@@ -2276,7 +2276,7 @@
 configure:10222: result: yes
 configure:10235: checking for XftDisplayInfoGet in -lXft
 configure:10265: gcc -o conftest -g -O2  -I/usr/include/freetype2  conftest.c 
-lXft  -lasound  -lasound -lm  >&5
-/tmp/ccaDYgMP.o: In function 
`main':/home/creichen/work/port/freesci/conftest.c:68: undefined reference to 
`XftDisplayInfoGet'
+/tmp/ccSxZp1S.o: In function 
`main':/home/creichen/work/port/tmp/trunk/conftest.c:68: undefined reference to 
`XftDisplayInfoGet'
 collect2: ld returned 1 exit status
 configure:10271: $? = 1
 configure: failed program was:
@@ -2718,6 +2718,7 @@
 config.status:786: creating src/menu/Makefile
 config.status:786: creating freesci.spec
 config.status:852: creating config.h
+config.status:1054: config.h is unchanged
 config.status:1212: executing default-1 commands
 
 ## ---------------- ##

Modified: freesci/trunk/src/engine/kscripts.c
===================================================================
--- freesci/trunk/src/engine/kscripts.c 2006-02-05 09:52:31 UTC (rev 1522)
+++ freesci/trunk/src/engine/kscripts.c 2006-02-06 01:49:46 UTC (rev 1523)
@@ -153,7 +153,7 @@
                break;
        case 0 :
                which = scir_find_resource(s->resmgr, restype, resnr, 0);
-               scir_unlock_resource(s->resmgr, which, resnr, restype);
+               scir_unlock_resource(s->resmgr, which, restype, resnr);
                break;
        }
 }

Modified: freesci/trunk/src/scicore/resource.c
===================================================================
--- freesci/trunk/src/scicore/resource.c        2006-02-05 09:52:31 UTC (rev 
1522)
+++ freesci/trunk/src/scicore/resource.c        2006-02-06 01:49:46 UTC (rev 
1523)
@@ -573,7 +573,7 @@
 }
 
 void
-scir_unlock_resource(resource_mgr_t *mgr, resource_t *res, int resnum, int 
restype)
+scir_unlock_resource(resource_mgr_t *mgr, resource_t *res, int restype, int 
resnum)
 {
        if (!res) {
                sciprintf("Resmgr: Warning: Attempt to unlock non-existant"