[Pkg-shadow-commits] r2806 - upstream/trunk/lib

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-25 14:16:22 +0000 (Sat, 25 Apr 2009)
New Revision: 2806

Modified:
   upstream/trunk/lib/commonio.c
   upstream/trunk/lib/commonio.h
Log:
Updated splint annotations.


Modified: upstream/trunk/lib/commonio.c
===================================================================
--- upstream/trunk/lib/commonio.c	2009-04-25 13:41:52 UTC (rev 2805)
+++ upstream/trunk/lib/commonio.c	2009-04-25 14:16:22 UTC (rev 2806)
@@ -69,7 +69,7 @@
 	const char *);
 static /*@dependent@*/ /*@null@*/struct commonio_entry *next_entry_by_name (
 	struct commonio_db *,
-	struct commonio_entry *pos,
+	/*@null@*/struct commonio_entry *pos,
 	const char *);
 
 static int lock_count = 0;
@@ -514,7 +514,8 @@
 		return 0;
 	}
 
-	db->head = db->tail = db->cursor = NULL;
+	db->head = db->tail = NULL;
+	db->cursor = NULL;
 	db->changed = false;
 
 	db->fp = fopen (db->filename, db->readonly ? "r" : "r+");

Modified: upstream/trunk/lib/commonio.h
===================================================================
--- upstream/trunk/lib/commonio.h	2009-04-25 13:41:52 UTC (rev 2805)
+++ upstream/trunk/lib/commonio.h	2009-04-25 14:16:22 UTC (rev 2806)
@@ -126,7 +126,8 @@
 	/*
 	 * Head, tail, current position in linked list.
 	 */
-	/*@owned@*/ /*@null@*/struct commonio_entry *head, *tail, *cursor;
+	/*@owned@*/ /*@null@*/struct commonio_entry *head, *tail;
+	/*@dependent@*/ /*@null@*/struct commonio_entry *cursor;
 
 	/*
 	 * Various flags.