Merge pull request #212 from yangfl/temp2

Remove trailing space
2024-12-26 21:04:24 +08:00 · 2017-11-04 14:24:47 +01:00 · 2017-11-04 14:24:47 +01:00 · b5f2e5c540
commit b5f2e5c540
parent 8412b1e2cd fa00278f66
12 changed files with 45 additions and 45 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -238,7 +238,7 @@ endif()
 option(ENABLE_LOCALES "Enable the use of locales" ON)
 if(ENABLE_LOCALES)
 	add_definitions(-DENABLE_LOCALES)
-endif() 
+endif()

 add_subdirectory(tests)
 add_subdirectory(fuzzing)
--- a/38
+++ b/38
@ -1,20 +1,20 @@
-  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
- 
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
- 
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
- 
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

--- a/cJSON.c
+++ b/cJSON.c
@ -1062,7 +1062,7 @@ fail:
        {
            *return_parse_end = (const char*)local_error.json + local_error.position;
        }
- 
+
        global_error = local_error;
    }

--- a/fuzzing/inputs/test11
+++ b/fuzzing/inputs/test11
@ -1,8 +1,8 @@
 bf{
-"name": "Jack (\"Bee\") Nimble", 
-"format": {"type":       "rect", 
-"width":      1920, 
-"height":     1080, 
+"name": "Jack (\"Bee\") Nimble",
+"format": {"type":       "rect",
+"width":      1920,
+"height":     1080,
 "interlace":  false,"frame rate": 24
 }
 }
--- a/fuzzing/inputs/test3
+++ b/fuzzing/inputs/test3
@ -6,7 +6,7 @@ bf{"widget": {
        "width": 500,
        "height": 500
    },
-    "image": { 
+    "image": {
        "src": "Images/Sun.png",
        "name": "sun1",
        "hOffset": 250,
@ -23,4 +23,4 @@ bf{"widget": {
        "alignment": "center",
        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
    }
-}}    
+}}
--- a/fuzzing/inputs/test3.bu
+++ b/fuzzing/inputs/test3.bu
@ -6,7 +6,7 @@ bu{"widget": {
        "width": 500,
        "height": 500
    },
-    "image": { 
+    "image": {
        "src": "Images/Sun.png",
        "name": "sun1",
        "hOffset": 250,
@ -23,4 +23,4 @@ bu{"widget": {
        "alignment": "center",
        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
    }
-}}    
+}}
--- a/fuzzing/inputs/test3.uf
+++ b/fuzzing/inputs/test3.uf
@ -6,7 +6,7 @@ uf{"widget": {
        "width": 500,
        "height": 500
    },
-    "image": { 
+    "image": {
        "src": "Images/Sun.png",
        "name": "sun1",
        "hOffset": 250,
@ -23,4 +23,4 @@ uf{"widget": {
        "alignment": "center",
        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
    }
-}}    
+}}
--- a/fuzzing/inputs/test3.uu
+++ b/fuzzing/inputs/test3.uu
@ -6,7 +6,7 @@ uu{"widget": {
        "width": 500,
        "height": 500
    },
-    "image": { 
+    "image": {
        "src": "Images/Sun.png",
        "name": "sun1",
        "hOffset": 250,
@ -23,4 +23,4 @@ uu{"widget": {
        "alignment": "center",
        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
    }
-}}    
+}}
--- a/fuzzing/inputs/test4
+++ b/fuzzing/inputs/test4
@ -1,5 +1,5 @@
 bf{"web-app": {
-  "servlet": [   
+  "servlet": [
    {
      "servlet-name": "cofaxCDS",
      "servlet-class": "org.cofax.cds.CDSServlet",
@ -55,7 +55,7 @@ bf{"web-app": {
    {
      "servlet-name": "cofaxAdmin",
      "servlet-class": "org.cofax.cds.AdminServlet"},
- 
+
    {
      "servlet-name": "fileServlet",
      "servlet-class": "org.cofax.cds.FileServlet"},
@ -82,7 +82,7 @@ bf{"web-app": {
    "cofaxAdmin": "/admin/*",
    "fileServlet": "/static/*",
    "cofaxTools": "/tools/*"},
- 
+
  "taglib": {
    "taglib-uri": "cofax.tld",
    "taglib-location": "/WEB-INF/tlds/cofax.tld"}}}
--- a/tests/inputs/test11
+++ b/tests/inputs/test11
@ -1,8 +1,8 @@
 {
-"name": "Jack (\"Bee\") Nimble", 
-"format": {"type":       "rect", 
-"width":      1920, 
-"height":     1080, 
+"name": "Jack (\"Bee\") Nimble",
+"format": {"type":       "rect",
+"width":      1920,
+"height":     1080,
 "interlace":  false,"frame rate": 24
 }
 }
--- a/tests/inputs/test3
+++ b/tests/inputs/test3
@ -6,7 +6,7 @@
        "width": 500,
        "height": 500
    },
-    "image": { 
+    "image": {
        "src": "Images/Sun.png",
        "name": "sun1",
        "hOffset": 250,
@ -23,4 +23,4 @@
        "alignment": "center",
        "onMouseUp": "sun1.opacity = (sun1.opacity / 100) * 90;"
    }
-}}    
+}}   
--- a/tests/inputs/test4
+++ b/tests/inputs/test4
@ -1,5 +1,5 @@
 {"web-app": {
-  "servlet": [   
+  "servlet": [  
    {
      "servlet-name": "cofaxCDS",
      "servlet-class": "org.cofax.cds.CDSServlet",
@ -55,7 +55,7 @@
    {
      "servlet-name": "cofaxAdmin",
      "servlet-class": "org.cofax.cds.AdminServlet"},
- 
+
    {
      "servlet-name": "fileServlet",
      "servlet-class": "org.cofax.cds.FileServlet"},
@ -82,7 +82,7 @@
    "cofaxAdmin": "/admin/*",
    "fileServlet": "/static/*",
    "cofaxTools": "/tools/*"},
- 
+
  "taglib": {
    "taglib-uri": "cofax.tld",
    "taglib-location": "/WEB-INF/tlds/cofax.tld"}}}