Merge from branch-2-1

[netatalk.git] / etc / afpd / mangle.c

diff --git a/etc/afpd/mangle.c b/etc/afpd/mangle.c
index 7769542df4a4fe8e9df8a8f94043bbab57b42866..91533e619a674d9748b5c1cc6f365c6d58952aae 100644 (file)
--- a/etc/afpd/mangle.c
+++ b/etc/afpd/mangle.c
@@ -182,11 +182,11 @@ private_demangle(const struct vol *vol, char *mfilename, cnid_t did, cnid_t *osx
         }
         if (!osx) {
             /* it's not from cname so mfilename and dir must be the same */
-            if (strcmp(cfrombstring(dir->d_m_name), mfilename) == 0) {
-                return cfrombstring(dir->d_u_name);
+            if (strcmp(cfrombstr(dir->d_m_name), mfilename) == 0) {
+                return cfrombstr(dir->d_u_name);
             }
         } else {
-            return demangle_checks(vol, cfrombstring(dir->d_u_name), mfilename, prefix, t);
+            return demangle_checks(vol, cfrombstr(dir->d_u_name), mfilename, prefix, t);
         }
     }
     else if (NULL != (u_name = cnid_resolve(vol->v_cdb, &id, buffer, len)) ) {