Merge branch 'dev-uint'

[libucw.git] / ucw / res-subpool.c

diff --git a/ucw/res-subpool.c b/ucw/res-subpool.c
index 5b4271308b31e288e75a55c2a4b14b302ce38e2d..f0a112c6b4bfb8ea3aea3080be9ee52f073bdd77 100644 (file)
--- a/ucw/res-subpool.c
+++ b/ucw/res-subpool.c
@@ -7,8 +7,8 @@
  *     of the GNU Lesser General Public License.
  */
 
  *     of the GNU Lesser General Public License.
  */
 

-#include "ucw/lib.h"
-#include "ucw/respool.h"
+#include <ucw/lib.h>
+#include <ucw/resource.h>

 
 #include <stdio.h>
 
 
 #include <stdio.h>
 


@@ -28,7 +28,7 @@ subpool_res_detach(struct resource *r)
 }
 
 static void
 }
 
 static void

-subpool_res_dump(struct resource *r, uns indent)
+subpool_res_dump(struct resource *r, uint indent)

 {
   printf(":\n");
   rp_dump(r->priv, indent);
 {
   printf(":\n");
   rp_dump(r->priv, indent);


@@ -46,7 +46,6 @@ res_subpool(struct respool *rp)
 {
   ASSERT(!rp->subpool_of);
   struct resource *r = res_new(&subpool_res_class, rp);
 {
   ASSERT(!rp->subpool_of);
   struct resource *r = res_new(&subpool_res_class, rp);

-  ASSERT(r);

   ASSERT(r->rpool != rp);              // Avoid simple loops
   rp->subpool_of = r;
   return r;
   ASSERT(r->rpool != rp);              // Avoid simple loops
   rp->subpool_of = r;
   return r;