util/StringCompare: add StringIsEmpty()
This commit is contained in:
@@ -23,6 +23,7 @@
|
||||
#include "fs/AllocatedPath.hxx"
|
||||
#include "util/Error.hxx"
|
||||
#include "util/Domain.hxx"
|
||||
#include "util/StringCompare.hxx"
|
||||
|
||||
#include <set>
|
||||
|
||||
@@ -164,7 +165,7 @@ CompositeStorage::Directory::Unmount()
|
||||
bool
|
||||
CompositeStorage::Directory::Unmount(const char *uri)
|
||||
{
|
||||
if (*uri == 0)
|
||||
if (StringIsEmpty(uri))
|
||||
return Unmount();
|
||||
|
||||
const std::string name = NextSegment(uri);
|
||||
|
@@ -22,10 +22,11 @@
|
||||
#include "storage/StoragePlugin.hxx"
|
||||
#include "storage/StorageInterface.hxx"
|
||||
#include "storage/FileInfo.hxx"
|
||||
#include "util/Error.hxx"
|
||||
#include "fs/FileInfo.hxx"
|
||||
#include "fs/AllocatedPath.hxx"
|
||||
#include "fs/DirectoryReader.hxx"
|
||||
#include "util/Error.hxx"
|
||||
#include "util/StringCompare.hxx"
|
||||
|
||||
#include <string>
|
||||
|
||||
@@ -108,7 +109,7 @@ LocalStorage::MapUTF8(const char *uri_utf8) const
|
||||
{
|
||||
assert(uri_utf8 != nullptr);
|
||||
|
||||
if (*uri_utf8 == 0)
|
||||
if (StringIsEmpty(uri_utf8))
|
||||
return base_utf8;
|
||||
|
||||
return PathTraitsUTF8::Build(base_utf8.c_str(), uri_utf8);
|
||||
@@ -119,7 +120,7 @@ LocalStorage::MapFS(const char *uri_utf8, Error &error) const
|
||||
{
|
||||
assert(uri_utf8 != nullptr);
|
||||
|
||||
if (*uri_utf8 == 0)
|
||||
if (StringIsEmpty(uri_utf8))
|
||||
return base_fs;
|
||||
|
||||
AllocatedPath path_fs = AllocatedPath::FromUTF8(uri_utf8, error);
|
||||
|
@@ -30,13 +30,14 @@
|
||||
#include "lib/nfs/Connection.hxx"
|
||||
#include "lib/nfs/Glue.hxx"
|
||||
#include "fs/AllocatedPath.hxx"
|
||||
#include "util/Error.hxx"
|
||||
#include "thread/Mutex.hxx"
|
||||
#include "thread/Cond.hxx"
|
||||
#include "event/Loop.hxx"
|
||||
#include "event/Call.hxx"
|
||||
#include "event/DeferredMonitor.hxx"
|
||||
#include "event/TimeoutMonitor.hxx"
|
||||
#include "util/Error.hxx"
|
||||
#include "util/StringCompare.hxx"
|
||||
|
||||
extern "C" {
|
||||
#include <nfsc/libnfs.h>
|
||||
@@ -232,7 +233,7 @@ NfsStorage::MapUTF8(const char *uri_utf8) const
|
||||
{
|
||||
assert(uri_utf8 != nullptr);
|
||||
|
||||
if (*uri_utf8 == 0)
|
||||
if (StringIsEmpty(uri_utf8))
|
||||
return base;
|
||||
|
||||
return PathTraitsUTF8::Build(base.c_str(), uri_utf8);
|
||||
|
@@ -25,8 +25,9 @@
|
||||
#include "lib/smbclient/Init.hxx"
|
||||
#include "lib/smbclient/Mutex.hxx"
|
||||
#include "fs/Traits.hxx"
|
||||
#include "util/Error.hxx"
|
||||
#include "thread/Mutex.hxx"
|
||||
#include "util/Error.hxx"
|
||||
#include "util/StringCompare.hxx"
|
||||
|
||||
#include <libsmbclient.h>
|
||||
|
||||
@@ -80,7 +81,7 @@ SmbclientStorage::MapUTF8(const char *uri_utf8) const
|
||||
{
|
||||
assert(uri_utf8 != nullptr);
|
||||
|
||||
if (*uri_utf8 == 0)
|
||||
if (StringIsEmpty(uri_utf8))
|
||||
return base;
|
||||
|
||||
return PathTraitsUTF8::Build(base.c_str(), uri_utf8);
|
||||
|
Reference in New Issue
Block a user