projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Possible fix for memory pool problem in session click.
[ardour.git]
/
libs
/
pbd
/
mountpoint.cc
diff --git
a/libs/pbd/mountpoint.cc
b/libs/pbd/mountpoint.cc
index 65f011c745efa0de2f005366d3de4214985073ee..82aaadb9eb26f2a6a27ad0d58cc69829d881358b 100644
(file)
--- a/
libs/pbd/mountpoint.cc
+++ b/
libs/pbd/mountpoint.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2002 Paul Davis
+ Copyright (C) 2002 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-50,7
+50,7
@@
mountpoint (string path)
unsigned int matchlen;
const char *cpath = path.c_str();
char best[PATH_MAX+1];
unsigned int matchlen;
const char *cpath = path.c_str();
char best[PATH_MAX+1];
-
+
if ((mntf = setmntent ("/etc/mtab", "r")) == 0) {
return "";
}
if ((mntf = setmntent ("/etc/mtab", "r")) == 0) {
return "";
}
@@
-63,7
+63,7
@@
mountpoint (string path)
n = 0;
matchlen = 0;
n = 0;
matchlen = 0;
- /* note: strcmp's semantics are not
+ /* note: strcmp's semantics are not
strict enough to use for this.
*/
strict enough to use for this.
*/
@@
-95,11
+95,16
@@
mountpoint (string path)
}
#elif defined(PLATFORM_WINDOWS)
}
#elif defined(PLATFORM_WINDOWS)
-
+#include <assert.h>
string
mountpoint (string path)
{
string
mountpoint (string path)
{
- // TODO ... if needed
+ /* this function is currently only called from 'old_peak_path()'
+ * via find_broken_peakfile() - only relevant for loading pre
+ * libsndfile Ardour 2.0 sessions.
+ */
+ assert(0);
+ return ""; // TODO ... if needed
}
#else // !HAVE_GETMNTENT
}
#else // !HAVE_GETMNTENT
@@
-117,10
+122,10
@@
mountpoint (string path)
unsigned int matchlen;
const char *cpath = path.c_str();
char best[PATH_MAX+1];
unsigned int matchlen;
const char *cpath = path.c_str();
char best[PATH_MAX+1];
-
- /* From the manpage, under "BUGS" : "The memory allocated by getmntinfo() cannot be free(3)'d by the
+
+ /* From the manpage, under "BUGS" : "The memory allocated by getmntinfo() cannot be free(3)'d by the
application."
application."
-
+
Thus: we do NOT try to free memory allocated by getmntinfo()
*/
Thus: we do NOT try to free memory allocated by getmntinfo()
*/
@@
-134,7
+139,7
@@
mountpoint (string path)
unsigned int n = 0;
matchlen = 0;
unsigned int n = 0;
matchlen = 0;
- /* note: strcmp's semantics are not
+ /* note: strcmp's semantics are not
strict enough to use for this.
*/
strict enough to use for this.
*/
@@
-158,13
+163,13
@@
mountpoint (string path)
}
}
}
}
}
}
-
+
return best;
}
#endif // HAVE_GETMNTENT
#ifdef TEST_MOUNTPOINT
return best;
}
#endif // HAVE_GETMNTENT
#ifdef TEST_MOUNTPOINT
-
+
main (int argc, char *argv[])
{
printf ("mp of %s = %s\n", argv[1], mountpoint (argv[1]).c_str());
main (int argc, char *argv[])
{
printf ("mp of %s = %s\n", argv[1], mountpoint (argv[1]).c_str());