Merge branch 'master' of skyjake.fi:skyjake/lagrange

1 files changed, 25 insertions, 3 deletions

diff --git a/src/bookmarks.c b/src/bookmarks.c
index 795e0d44..eff0146d 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
 #include "bookmarks.h"
 
 #include <the_Foundation/file.h>
@@ -63,7 +85,7 @@ void load_Bookmarks(iBookmarks *d, const char *dirPath) {
     if (open_File(f, readOnly_FileMode | text_FileMode)) {
         const iRangecc src = range_Block(collect_Block(readAll_File(f)));
         iRangecc line = iNullRange;
-        while (nextSplit_Rangecc(&src, "\n", &line)) {
+        while (nextSplit_Rangecc(src, "\n", &line)) {
             /* Skip empty lines. */ {
                 iRangecc ln = line;
                 trim_Rangecc(&ln);
@@ -78,9 +100,9 @@ void load_Bookmarks(iBookmarks *d, const char *dirPath) {
             initSeconds_Time(&bm->when, strtod(line.start, &endPos));
             line.start = skipSpace_CStr(endPos);
             setRange_String(&bm->url, line);
-            nextSplit_Rangecc(&src, "\n", &line);
+            nextSplit_Rangecc(src, "\n", &line);
             setRange_String(&bm->title, line);
-            nextSplit_Rangecc(&src, "\n", &line);
+            nextSplit_Rangecc(src, "\n", &line);
             setRange_String(&bm->tags, line);
             insert_Bookmarks_(d, bm);
         }