Description: use the correct spelling of occurred
Author: Christian T. Steigies <cts@debian.org>
Last-Update: 2018-09-11
Index: luola/src/hotseat.c
===================================================================
--- luola.orig/src/hotseat.c
+++ luola/src/hotseat.c
@@ -237,7 +237,7 @@ static int hotseat_startup_eventloop (vo
             needupdate = 0;
             isevent = 1;
             if (!SDL_WaitEvent (&Event)) {
-                fprintf(stderr,"Error occured while waiting for an event: %s\n",
+                fprintf(stderr,"Error occurred while waiting for an event: %s\n",
                         SDL_GetError ());
                 exit (1);
             }
Index: luola/src/intro.c
===================================================================
--- luola.orig/src/intro.c
+++ luola/src/intro.c
@@ -682,7 +682,7 @@ static int intro_event_loop (void) {
             needupdate = 0;
             isevent = 1;
             if (!SDL_WaitEvent (&Event)) {
-                printf ("Error occured while waiting for an event: %s\n",
+                printf ("Error occurred while waiting for an event: %s\n",
                         SDL_GetError ());
                 exit (1);
             }
Index: luola/src/lcmap.c
===================================================================
--- luola.orig/src/lcmap.c
+++ luola/src/lcmap.c
@@ -182,7 +182,7 @@ SDL_Surface *lcmap_to_surface_rw (SDL_RW
     /* Read the headers */
     if (!SDL_RWread (rw, tmpbuf, 1, 5)) {
         printf
-            ("Error occured while attempting to read the magic number of an LCMAP file\n");
+            ("Error occurred while attempting to read the magic number of an LCMAP file\n");
         return NULL;
     }
     if (strncmp ((char*)tmpbuf, "LCMAP", 5)) {
@@ -191,7 +191,7 @@ SDL_Surface *lcmap_to_surface_rw (SDL_RW
     }
     if (!SDL_RWread (rw, tmpbuf, 1, 5)) {
         printf
-            ("Error occured while attempting to read the LCMAP size info.\n");
+            ("Error occurred while attempting to read the LCMAP size info.\n");
         return NULL;
     }
     width = tmpbuf[0] | tmpbuf[1] << 8;
@@ -200,7 +200,7 @@ SDL_Surface *lcmap_to_surface_rw (SDL_RW
     colors = malloc (sizeof (SDL_Color) * palent);
     for (r = 0; r < palent; r++) {
         if (!SDL_RWread (rw, tmpbuf, 1, 3)) {
-            printf ("Error occured while reading LCMAP palette entry %d\n",
+            printf ("Error occurred while reading LCMAP palette entry %d\n",
                     r);
             return NULL;
         }
@@ -210,7 +210,7 @@ SDL_Surface *lcmap_to_surface_rw (SDL_RW
     }
     if (!SDL_RWread (rw, tmpbuf, 1, 8)) {
         printf
-            ("Error occured while attempting to read LCMAP data lengths.\n");
+            ("Error occurred while attempting to read LCMAP data lengths.\n");
         return NULL;
     }
     unpackedlen =
@@ -234,7 +234,7 @@ SDL_Surface *lcmap_to_surface_rw (SDL_RW
     }
     uplen = unpackedlen;
     if ((r = uncompress (data, &uplen, zdata, zlen)) != Z_OK) {
-        printf ("Error occured during unpack!\n");
+        printf ("Error occurred during unpack!\n");
         if (r == Z_MEM_ERROR)
             printf ("Not enough memory\n");
         else if (r == Z_BUF_ERROR)
Index: luola/src/ldat.c
===================================================================
--- luola.orig/src/ldat.c
+++ luola/src/ldat.c
@@ -113,33 +113,33 @@ LDAT *ldat_open_rw (SDL_RWops * rw)
     }
     /* Read catalog */
     if(Luola_ReadLE16 (newldat->data,&itemcount) == -1) {
-        fprintf(stderr,"Error occured while reading itemcount!\n");
+        fprintf(stderr,"Error occurred while reading itemcount!\n");
     }
 
     for (i = 0; i < itemcount; i++) {
         newblock = malloc (sizeof (LDAT_Block));
         memset (newblock, 0, sizeof (LDAT_Block));
         if (SDL_RWread (newldat->data, &idlen, 1, 1) == -1) {
-            fprintf (stderr, "(%d) Error occured while reading idlen!\n", i);
+            fprintf (stderr, "(%d) Error occurred while reading idlen!\n", i);
             return NULL;
         }
         newblock->ID = malloc (idlen + 1);
         if (SDL_RWread (newldat->data, newblock->ID, 1, idlen) == -1) {
-            fprintf (stderr, "(%d) Error occured while reading ID string!\n", i);
+            fprintf (stderr, "(%d) Error occurred while reading ID string!\n", i);
             return NULL;
         }
         newblock->ID[idlen] = '\0';
         if (Luola_ReadLE16(newldat->data, &newblock->index) == -1) {
-            fprintf (stderr, "(%d) Error occured while reading index number!\n", i);
+            fprintf (stderr, "(%d) Error occurred while reading index number!\n", i);
             return NULL;
         }
 
         if (Luola_ReadLE32(newldat->data, &newblock->pos) == -1) {
-            fprintf (stderr, "(%d) Error occured while reading position!\n", i);
+            fprintf (stderr, "(%d) Error occurred while reading position!\n", i);
             return NULL;
         }
         if (Luola_ReadLE32(newldat->data, &newblock->size) == -1) {
-            fprintf (stderr, "(%d) Error occured while reading size!\n", i);
+            fprintf (stderr, "(%d) Error occurred while reading size!\n", i);
             return NULL;
         }
         if (newldat->catalog == NULL)
@@ -283,7 +283,7 @@ int ldat_save_rw (LDAT * ldat, SDL_RWops
     block = ldat->catalog;
     while (block) {
         if(rw_to_rw_copy (rw, block->data, block->size)) {
-            fprintf(stderr,"Error occured in block \"%s\" %d\n",
+            fprintf(stderr,"Error occurred in block \"%s\" %d\n",
                     block->ID,block->index);
             return 1;
         }
Index: luola/src/level.c
===================================================================
--- luola.orig/src/level.c
+++ luola/src/level.c
@@ -209,7 +209,7 @@ void load_level (struct LevelFile *lev)
     /* Load level collisionmap */
     collmap = load_level_coll (lev);
     if (!collmap) {
-        printf ("An error occured while loading collisionmap\n");
+        printf ("An error occurred while loading collisionmap\n");
         exit (1);
     }
     if (collmap->w != lev_level.width || collmap->h != lev_level.height) {
Index: luola/tools/im_wings.c
===================================================================
--- luola.orig/tools/im_wings.c
+++ luola/tools/im_wings.c
@@ -129,7 +129,7 @@ static int load_level(FILE *fp) {
         return 1;
     }
     if(decode_pcx(fp,lev_pixels,datalen)) {
-        printf("Error occured while decoding PCX data!\n");
+        printf("Error occurred while decoding PCX data!\n");
         return 1;
     }
 
Index: luola/tools/lcmaptool.c
===================================================================
--- luola.orig/tools/lcmaptool.c
+++ luola/tools/lcmaptool.c
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
         mapdata = surface_to_lcmap(&maplen, surface);
         SDL_FreeSurface(surface);
         if (mapdata == NULL) {
-            fprintf(stderr,"Error occured while converting to LCMAP\n");
+            fprintf(stderr,"Error occurred while converting to LCMAP\n");
             return 1;
         }
         fp = fopen(argv[3], "wb");
Index: luola/tools/ldatar.c
===================================================================
--- luola.orig/tools/ldatar.c
+++ luola/tools/ldatar.c
@@ -72,7 +72,7 @@ static int pack_ldat(const char *filenam
     if(verbose)
         printf("Saving \"%s\"...\n",outputfile);
     if(ldat_save_file(ldat, outputfile)) {
-        fputs("Error occured while saving",stderr);
+        fputs("Error occurred while saving",stderr);
         ldat_free(ldat);
         return 1;
     }
Index: luola/acinclude.m4
===================================================================
--- luola.orig/acinclude.m4
+++ luola/acinclude.m4
@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
           echo "*** If you have an old version installed, it is best to remove it, although"
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
         [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+          echo "*** exact error that occurred. This usually means SDL was incorrectly installed"
           echo "*** or that you have moved SDL since it was installed. In the latter case, you"
           echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
           CFLAGS="$ac_save_CFLAGS"
Index: luola/configure
===================================================================
--- luola.orig/configure
+++ luola/configure
@@ -5760,7 +5760,7 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
  echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+          echo "*** exact error that occurred. This usually means SDL was incorrectly installed"
           echo "*** or that you have moved SDL since it was installed. In the latter case, you"
           echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
 fi
