[cairo-commit] 3 commits - src/cairo-surface.c src/check-doc-syntax.awk src/check-doc-syntax.sh

[Uli Schlachter]

 src/cairo-surface.c      |    2 --
 src/check-doc-syntax.awk |    4 +++-
 src/check-doc-syntax.sh  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3bff546ebe0859c65ba608a956a55b5647bfd37f
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun May 6 21:48:42 2012 +0200

    c_surface_set_mime_data: Remove duplicate "Since"
    
    This fixes the following message from "make check":
    
    ./cairo-surface.c (1192): ERROR: cairo_surface_set_mime_data: Duplicate 'Since'
    field
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/cairo-surface.c b/src/cairo-surface.c
index e16a354..35ac391 100644
--- a/src/cairo-surface.c
+++ b/src/cairo-surface.c
@@ -1183,8 +1183,6 @@ _cairo_mime_data_destroy (void *ptr)
  * discarded if you draw on the surface afterwards. Use this function
  * with care.
  *
- * Since: 1.10
- *
  * Return value: %CAIRO_STATUS_SUCCESS or %CAIRO_STATUS_NO_MEMORY if a
  * slot could not be allocated for the user data.
  *
commit fcccb1a65aeab7b1bf199e728b58af9bf21e197b
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun May 6 21:45:32 2012 +0200

    check-doc-syntax: Find duplicate "Since:" tags
    
    It makes no sense to say more than one time when some symbol was introduced.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/check-doc-syntax.awk b/src/check-doc-syntax.awk
index d4325ce..5fdabda 100755
--- a/src/check-doc-syntax.awk
+++ b/src/check-doc-syntax.awk
@@ -69,6 +69,9 @@ in_doc {
 }
 
 /^ \* Since: ([0-9]*.[0-9]*|TBD)$/ {
+    if (doc_has_since != 0) {
+	log_error("Duplicate 'Since' field")
+    }
     doc_has_since = doc_line
 }
 
@@ -102,4 +105,4 @@ in_doc {
 END {
     if (!name_found)
 	log_warning("not found")
-}
\ No newline at end of file
+}
commit a184de906490e743430919c55a2d5099987d4d69
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun May 6 21:41:28 2012 +0200

    check-doc-syntax: Make this work again
    
    Commit ed90616b77570 changed the way the awk script gets invoked. Due to a
    missing "test", this resulted in the awk script never getting invoked at all.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/check-doc-syntax.sh b/src/check-doc-syntax.sh
index bfda7a2..c74fb87 100755
--- a/src/check-doc-syntax.sh
+++ b/src/check-doc-syntax.sh
@@ -71,7 +71,7 @@ if echo $FILES | xargs grep "$note_regexp" /dev/null; then
 fi >&2
 
 # Only run the syntax checker on the source files (not doc/)
-if -e ./check-doc-syntax.awk; then
+if test -e ./check-doc-syntax.awk; then
     if echo $FILES | xargs ./check-doc-syntax.awk ; then
 	    :
     else