Fixed programming errors in the AVRISP-MKII project when the programming packet is...

[pub/USBasp.git] / Projects / Webserver / Lib / FATFs / ff.c

diff --git a/Projects/Webserver/Lib/FATFs/ff.c b/Projects/Webserver/Lib/FATFs/ff.c
index cd01f46..cb2b425 100644 (file)
--- a/Projects/Webserver/Lib/FATFs/ff.c
+++ b/Projects/Webserver/Lib/FATFs/ff.c
@@ -114,7 +114,7 @@
 #endif
 
 
-/* Reentrancy related */
+/* Re-entrancy related */
 #if _FS_REENTRANT
 #if _USE_LFN == 1
 #error Static LFN work area must not be used in re-entrant configuration.
@@ -1321,7 +1321,7 @@ FRESULT create_name (
                if (w != ' ' && w != '.') break;
                di--;
        }
-       if (!di) return FR_INVALID_NAME;        /* Reject nul string */
+       if (!di) return FR_INVALID_NAME;        /* Reject null string */
 
        lfn[di] = 0;                                            /* LFN is created */
 
@@ -1458,7 +1458,7 @@ FRESULT create_name (
        *path = &p[si];                                         /* Return pointer to the next segment */
        c = (c <= ' ') ? NS_LAST : 0;           /* Set last segment flag if end of path */
 
-       if (!i) return FR_INVALID_NAME;         /* Reject nul string */
+       if (!i) return FR_INVALID_NAME;         /* Reject null string */
        if (sfn[0] == 0xE5) sfn[0] = 0x05;      /* When first char collides with 0xE5, replace it with 0x05 */
 
        if (ni == 8) b <<= 2;
@@ -1582,7 +1582,7 @@ FRESULT follow_path (     /* FR_OK(0): successful, !=0: error code */
        dj->sclust = 0;                                         /* Start from the root dir */
 #endif
 
-       if ((UINT)*path < ' ') {                        /* Nul path means the start directory itself */
+       if ((UINT)*path < ' ') {                        /* Null path means the start directory itself */
                res = dir_sdi(dj, 0);
                dj->dir = 0;
 
@@ -2289,7 +2289,7 @@ FRESULT f_close (
 #if _FS_REENTRANT
                res = validate(fp->fs, fp->id);
                if (res == FR_OK) {
-                       res = dec_lock(fp->fs, fp->lockid);     
+                       res = dec_lock(fp->fs, fp->lockid);
                        unlock_fs(fp->fs, FR_OK);
                }
 #else
@@ -3177,7 +3177,7 @@ FRESULT f_mkfs (
        if (au == 0) au = 1;
        if (au > 128) au = 128;
 
-       /* Pre-compute number of clusters and FAT syb-type */
+       /* Pre-compute number of clusters and FAT sub-type */
        n_clst = n_vol / au;
        fmt = FS_FAT12;
        if (n_clst >= MIN_FAT16) fmt = FS_FAT16;
@@ -3539,7 +3539,7 @@ int f_printf (
                        res++;
                }
                do {
-                       cc = f_putc(s[--i], fil); 
+                       cc = f_putc(s[--i], fil);
                        res++;
                } while (i && cc != EOF);
                if (cc != EOF) cc = 0;
@@ -3551,3 +3551,4 @@ int f_printf (
 
 #endif /* !_FS_READONLY */
 #endif /* _USE_STRFUNC */
+