diff options
author | Leo C | 2016-09-08 20:59:55 +0200 |
---|---|---|
committer | Leo C | 2016-09-08 20:59:55 +0200 |
commit | b30c4e8f1aef96f6fdc93da9f125545f5f74d06e (patch) | |
tree | e1f9e4cfcc0c24cfb8f35825d83aa5f878c2717a /fatfs/doc/en/unlink.html | |
parent | e1deb7c3bc0500aabf5d099adb231f6d1d27f01d (diff) | |
parent | 70702af1370e44e32fb2c3c507e4759a187b4fe5 (diff) | |
download | z180-stamp-b30c4e8f1aef96f6fdc93da9f125545f5f74d06e.zip |
Merge branch 'chan-fatfs' into fatfs-integration
# Conflicts:
# .gitignore
# fatfs/src/diskio.h
# fatfs/src/option/ccsbcs.c
# include/avr/ffconf.h
# include/integer.h
Diffstat (limited to 'fatfs/doc/en/unlink.html')
-rw-r--r-- | fatfs/doc/en/unlink.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fatfs/doc/en/unlink.html b/fatfs/doc/en/unlink.html index fc884c3..4cd1f66 100644 --- a/fatfs/doc/en/unlink.html +++ b/fatfs/doc/en/unlink.html @@ -25,7 +25,7 @@ FRESULT f_unlink ( <h4>Parameter</h4>
<dl class="par">
<dt>path</dt>
-<dd>Pointer to the null-terminated string that specifies an <a href="filename.html">object</a> to be removed.</dd>
+<dd>Pointer to a null-terminated string that specifies the <a href="filename.html">file or sub-directory</a> to be removed.</dd>
</dl>
</div>
@@ -59,7 +59,7 @@ FRESULT f_unlink ( If condition of the object to be removed is applicable to the following terms, the function will be rejected.<ul>
<li>The file/sub-directory must not have read-only attribute (<tt>AM_RDO</tt>), or the function will be rejected with <tt>FR_DENIED</tt>.</li>
<li>The sub-directory must be empty and must not be current directory, or the function will be rejected with <tt>FR_DENIED</tt>.</li>
-<li>The file/sub-directory must not be opened, or the <em>FAT volume can be collapsed</em>. It can be rejected with <tt>FR_LOCKED</tt> when <a href="appnote.html#dup">file lock feature</a> is enabled.</li>
+<li>The file/sub-directory must not be opened, or the <em>FAT volume can be collapsed</em>. It will be rejected safely when <a href="appnote.html#dup">file lock function</a> is enabled.</li>
</ul>
</div>
|