From 119f0b939487be7edf6e68d5696eee3e605340a5 Mon Sep 17 00:00:00 2001 From: drl7x Date: Mon, 16 Jul 2001 18:47:02 +0000 Subject: [PATCH] made strncat use size_t --- lib/Makefile | 12 ++++++------ lib/ansi.h | 4 ++-- lib/ansi.lcd | 18 +++++++++--------- lib/ansistrict.lcd | 18 +++++++++--------- lib/posix.lcd | 18 +++++++++--------- lib/posixstrict.lcd | 18 +++++++++--------- lib/unix.lcd | 18 +++++++++--------- lib/unixstrict.lcd | 18 +++++++++--------- 8 files changed, 62 insertions(+), 62 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index f559a72..83652f8 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,8 +1,8 @@ all: - lclint -nolib +impconj ansi.h -dump ansi - lclint -nolib +impconj -DSTRICT ansi.h -dump ansistrict - lclint -nolib +impconj ansi.h posix.h -dump posix - lclint -nolib +impconj -DSTRICT ansi.h posix.h -dump posixstrict - lclint -nolib +impconj ansi.h posix.h unix.h -dump unix - lclint -nolib +impconj -DSTRICT ansi.h posix.h unix.h -dump unixstrict + ../bin/lclint -nolib +impconj ansi.h -dump ansi + ../bin/lclint -nolib +impconj -DSTRICT ansi.h -dump ansistrict + ../bin/lclint -nolib +impconj ansi.h posix.h -dump posix + ../bin/lclint -nolib +impconj -DSTRICT ansi.h posix.h -dump posixstrict + ../bin/lclint -nolib +impconj ansi.h posix.h unix.h -dump unix + ../bin/lclint -nolib +impconj -DSTRICT ansi.h posix.h unix.h -dump unixstrict diff --git a/lib/ansi.h b/lib/ansi.h index 72772bb..aa4674e 100644 --- a/lib/ansi.h +++ b/lib/ansi.h @@ -867,12 +867,12 @@ extern void /*@alt char * @*/ /*@modifies *s1@*/ /*@requires MaxSet(s1) >= ( n - 1 ); @*/ /*@ensures MaxRead (s2) >= MaxRead(s1) /\ MaxRead (s1) <= n; @*/; extern void /*@alt char * @*/ - strcat (/*@unique@*/ /*@returned@*/ /*@out@*/ char *s1, char *s2) + strcat (/*@unique@*/ /*@returned@*/ char *s1, char *s2) /*@modifies *s1@*/ /*@requires MaxSet(s1) >= (MaxRead(s1) + MaxRead(s2) );@*/ /*@ensures MaxRead(result) == (MaxRead(s1) + MaxRead(s2) );@*/; extern void /*@alt char * @*/ - strncat (/*@unique@*/ /*@returned@*/ /*@out@*/ char *s1, char *s2, int n) + strncat (/*@unique@*/ /*@returned@*/ char *s1, char *s2, size_t n) /*@modifies *s1@*/ /*@requires MaxSet(s1) >= ( MaxRead(s1) + n); @*/ /*@ensures MaxRead(result) >= (MaxRead(s1) + n); @*/; /*drl end*/ diff --git a/lib/ansi.lcd b/lib/ansi.lcd index 306e314..42a9952 100644 --- a/lib/ansi.lcd +++ b/lib/ansi.lcd @@ -1,5 +1,5 @@ ;;LCLint Dump: ansi.lcd -;;LCLint 3.0b-alpha --- 20 June 2001 +;;LCLint 3.0.0.7 --- 12 July 2001 ;;lib:167 ;;ctTable 0 u-2 19 38 @@ -583,12 +583,12 @@ 3 f0 (23|@5|4@0@9&#,23|$#,63|$#,)! 3 f1 (23|@5|4@0@9&#,23|$#,63|$#,)! 3 f574 (23|@5|4@0@9&#,23|$#,63|$#,)! -3 f0 (23|@5|4@0@9&#,23|$#,)! -3 f1 (23|@5|4@0@9&#,23|$#,)! -3 f574 (23|@5|4@0@9&#,23|$#,)! -3 f0 (23|@5|4@0@9&#,23|$#,5|$#,)! -3 f1 (23|@5|4@0@9&#,23|$#,5|$#,)! -3 f574 (23|@5|4@0@9&#,23|$#,5|$#,)! +3 f0 (23|@5|0@0@9&#,23|$#,)! +3 f1 (23|@5|0@0@9&#,23|$#,)! +3 f574 (23|@5|0@0@9&#,23|$#,)! +3 f0 (23|@5|0@0@9&#,23|$#,63|$#,)! +3 f1 (23|@5|0@0@9&#,23|$#,63|$#,)! +3 f574 (23|@5|0@0@9&#,23|$#,63|$#,)! 3 f0 (20|$#,20|$#,63|$#,)! 3 f5 (20|$#,20|$#,63|$#,)! 3 f0 (23|$#,23|$#,)! @@ -1380,7 +1380,7 @@ Param 23 0 e2 2 2 -Param 5 2 +Param 63 2 ;; end precondition constraints post: C @@ -1403,7 +1403,7 @@ Param 23 0 e2 2 2 -Param 5 2 +Param 63 2 ;; end precondition constraints strchr pre:EMPTY diff --git a/lib/ansistrict.lcd b/lib/ansistrict.lcd index 2becbc7..e7dc655 100644 --- a/lib/ansistrict.lcd +++ b/lib/ansistrict.lcd @@ -1,5 +1,5 @@ ;;LCLint Dump: ansistrict.lcd -;;LCLint 3.0b-alpha --- 20 June 2001 +;;LCLint 3.0.0.7 --- 12 July 2001 ;;lib:167 ;;ctTable 0 u-2 19 38 @@ -540,12 +540,12 @@ 3 f0 (23|@5|4@0@9&#,23|$#,63|$#,)! 3 f1 (23|@5|4@0@9&#,23|$#,63|$#,)! 3 f531 (23|@5|4@0@9&#,23|$#,63|$#,)! -3 f0 (23|@5|4@0@9&#,23|$#,)! -3 f1 (23|@5|4@0@9&#,23|$#,)! -3 f531 (23|@5|4@0@9&#,23|$#,)! -3 f0 (23|@5|4@0@9&#,23|$#,5|$#,)! -3 f1 (23|@5|4@0@9&#,23|$#,5|$#,)! -3 f531 (23|@5|4@0@9&#,23|$#,5|$#,)! +3 f0 (23|@5|0@0@9&#,23|$#,)! +3 f1 (23|@5|0@0@9&#,23|$#,)! +3 f531 (23|@5|0@0@9&#,23|$#,)! +3 f0 (23|@5|0@0@9&#,23|$#,63|$#,)! +3 f1 (23|@5|0@0@9&#,23|$#,63|$#,)! +3 f531 (23|@5|0@0@9&#,23|$#,63|$#,)! 3 f0 (20|$#,20|$#,63|$#,)! 3 f5 (20|$#,20|$#,63|$#,)! 3 f0 (23|$#,23|$#,)! @@ -1337,7 +1337,7 @@ Param 23 0 e2 2 2 -Param 5 2 +Param 63 2 ;; end precondition constraints post: C @@ -1360,7 +1360,7 @@ Param 23 0 e2 2 2 -Param 5 2 +Param 63 2 ;; end precondition constraints strchr pre:EMPTY diff --git a/lib/posix.lcd b/lib/posix.lcd index fd9f47a..d4c9a74 100644 --- a/lib/posix.lcd +++ b/lib/posix.lcd @@ -1,5 +1,5 @@ ;;LCLint Dump: posix.lcd -;;LCLint 3.0b-alpha --- 20 June 2001 +;;LCLint 3.0.0.7 --- 12 July 2001 ;;lib:167 ;;ctTable 0 u-2 19 38 @@ -583,12 +583,12 @@ 3 f0 (23|@5|4@0@9&#,23|$#,63|$#,)! 3 f1 (23|@5|4@0@9&#,23|$#,63|$#,)! 3 f574 (23|@5|4@0@9&#,23|$#,63|$#,)! -3 f0 (23|@5|4@0@9&#,23|$#,)! -3 f1 (23|@5|4@0@9&#,23|$#,)! -3 f574 (23|@5|4@0@9&#,23|$#,)! -3 f0 (23|@5|4@0@9&#,23|$#,5|$#,)! -3 f1 (23|@5|4@0@9&#,23|$#,5|$#,)! -3 f574 (23|@5|4@0@9&#,23|$#,5|$#,)! +3 f0 (23|@5|0@0@9&#,23|$#,)! +3 f1 (23|@5|0@0@9&#,23|$#,)! +3 f574 (23|@5|0@0@9&#,23|$#,)! +3 f0 (23|@5|0@0@9&#,23|$#,63|$#,)! +3 f1 (23|@5|0@0@9&#,23|$#,63|$#,)! +3 f574 (23|@5|0@0@9&#,23|$#,63|$#,)! 3 f0 (20|$#,20|$#,63|$#,)! 3 f5 (20|$#,20|$#,63|$#,)! 3 f0 (23|$#,23|$#,)! @@ -1839,7 +1839,7 @@ Param 23 0 e2 2 2 -Param 5 2 +Param 63 2 ;; end precondition constraints post: C @@ -1862,7 +1862,7 @@ Param 23 0 e2 2 2 -Param 5 2 +Param 63 2 ;; end precondition constraints strchr pre:EMPTY diff --git a/lib/posixstrict.lcd b/lib/posixstrict.lcd index 5ce7df9..f36e0aa 100644 --- a/lib/posixstrict.lcd +++ b/lib/posixstrict.lcd @@ -1,5 +1,5 @@ ;;LCLint Dump: posixstrict.lcd -;;LCLint 3.0b-alpha --- 20 June 2001 +;;LCLint 3.0.0.7 --- 12 July 2001 ;;lib:167 ;;ctTable 0 u-2 19 38 @@ -540,12 +540,12 @@ 3 f0 (23|@5|4@0@9&#,23|$#,63|$#,)! 3 f1 (23|@5|4@0@9&#,23|$#,63|$#,)! 3 f531 (23|@5|4@0@9&#,23|$#,63|$#,)! -3 f0 (23|@5|4@0@9&#,23|$#,)! -3 f1 (23|@5|4@0@9&#,23|$#,)! -3 f531 (23|@5|4@0@9&#,23|$#,)! -3 f0 (23|@5|4@0@9&#,23|$#,5|$#,)! -3 f1 (23|@5|4@0@9&#,23|$#,5|$#,)! -3 f531 (23|@5|4@0@9&#,23|$#,5|$#,)! +3 f0 (23|@5|0@0@9&#,23|$#,)! +3 f1 (23|@5|0@0@9&#,23|$#,)! +3 f531 (23|@5|0@0@9&#,23|$#,)! +3 f0 (23|@5|0@0@9&#,23|$#,63|$#,)! +3 f1 (23|@5|0@0@9&#,23|$#,63|$#,)! +3 f531 (23|@5|0@0@9&#,23|$#,63|$#,)! 3 f0 (20|$#,20|$#,63|$#,)! 3 f5 (20|$#,20|$#,63|$#,)! 3 f0 (23|$#,23|$#,)! @@ -1802,7 +1802,7 @@ Param 23 0 e2 2 2 -Param 5 2 +Param 63 2 ;; end precondition constraints post: C @@ -1825,7 +1825,7 @@ Param 23 0 e2 2 2 -Param 5 2 +Param 63 2 ;; end precondition constraints strchr pre:EMPTY diff --git a/lib/unix.lcd b/lib/unix.lcd index 23289d0..a0806cc 100644 --- a/lib/unix.lcd +++ b/lib/unix.lcd @@ -1,5 +1,5 @@ ;;LCLint Dump: unix.lcd -;;LCLint 3.0b-alpha --- 20 June 2001 +;;LCLint 3.0.0.7 --- 12 July 2001 ;;lib:167 ;;ctTable 0 u-2 19 38 @@ -583,12 +583,12 @@ 3 f0 (23|@5|4@0@9&#,23|$#,63|$#,)! 3 f1 (23|@5|4@0@9&#,23|$#,63|$#,)! 3 f574 (23|@5|4@0@9&#,23|$#,63|$#,)! -3 f0 (23|@5|4@0@9&#,23|$#,)! -3 f1 (23|@5|4@0@9&#,23|$#,)! -3 f574 (23|@5|4@0@9&#,23|$#,)! -3 f0 (23|@5|4@0@9&#,23|$#,5|$#,)! -3 f1 (23|@5|4@0@9&#,23|$#,5|$#,)! -3 f574 (23|@5|4@0@9&#,23|$#,5|$#,)! +3 f0 (23|@5|0@0@9&#,23|$#,)! +3 f1 (23|@5|0@0@9&#,23|$#,)! +3 f574 (23|@5|0@0@9&#,23|$#,)! +3 f0 (23|@5|0@0@9&#,23|$#,63|$#,)! +3 f1 (23|@5|0@0@9&#,23|$#,63|$#,)! +3 f574 (23|@5|0@0@9&#,23|$#,63|$#,)! 3 f0 (20|$#,20|$#,63|$#,)! 3 f5 (20|$#,20|$#,63|$#,)! 3 f0 (23|$#,23|$#,)! @@ -2591,7 +2591,7 @@ Param 23 0 e2 2 2 -Param 5 2 +Param 63 2 ;; end precondition constraints post: C @@ -2614,7 +2614,7 @@ Param 23 0 e2 2 2 -Param 5 2 +Param 63 2 ;; end precondition constraints strchr pre:EMPTY diff --git a/lib/unixstrict.lcd b/lib/unixstrict.lcd index 712ed76..a2716ff 100644 --- a/lib/unixstrict.lcd +++ b/lib/unixstrict.lcd @@ -1,5 +1,5 @@ ;;LCLint Dump: unixstrict.lcd -;;LCLint 3.0b-alpha --- 20 June 2001 +;;LCLint 3.0.0.7 --- 12 July 2001 ;;lib:167 ;;ctTable 0 u-2 19 38 @@ -540,12 +540,12 @@ 3 f0 (23|@5|4@0@9&#,23|$#,63|$#,)! 3 f1 (23|@5|4@0@9&#,23|$#,63|$#,)! 3 f531 (23|@5|4@0@9&#,23|$#,63|$#,)! -3 f0 (23|@5|4@0@9&#,23|$#,)! -3 f1 (23|@5|4@0@9&#,23|$#,)! -3 f531 (23|@5|4@0@9&#,23|$#,)! -3 f0 (23|@5|4@0@9&#,23|$#,5|$#,)! -3 f1 (23|@5|4@0@9&#,23|$#,5|$#,)! -3 f531 (23|@5|4@0@9&#,23|$#,5|$#,)! +3 f0 (23|@5|0@0@9&#,23|$#,)! +3 f1 (23|@5|0@0@9&#,23|$#,)! +3 f531 (23|@5|0@0@9&#,23|$#,)! +3 f0 (23|@5|0@0@9&#,23|$#,63|$#,)! +3 f1 (23|@5|0@0@9&#,23|$#,63|$#,)! +3 f531 (23|@5|0@0@9&#,23|$#,63|$#,)! 3 f0 (20|$#,20|$#,63|$#,)! 3 f5 (20|$#,20|$#,63|$#,)! 3 f0 (23|$#,23|$#,)! @@ -2554,7 +2554,7 @@ Param 23 0 e2 2 2 -Param 5 2 +Param 63 2 ;; end precondition constraints post: C @@ -2577,7 +2577,7 @@ Param 23 0 e2 2 2 -Param 5 2 +Param 63 2 ;; end precondition constraints strchr pre:EMPTY -- 2.45.1