diff options
| author | Brennan Ashton <bashton@brennanashton.com> | 2019-10-29 23:09:43 -0700 |
|---|---|---|
| committer | Marcus Müller <mmueller@gnuradio.org> | 2019-11-01 14:44:45 +0100 |
| commit | a75f0c40fe0912535fe102792f27c13d01df8e3e (patch) | |
| tree | d045ac2056eeb94aa2cf4f2502b370057684ce0c /gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc | |
| parent | b1c588d78571c58b7e9953f4b841f8546ff9da06 (diff) | |
runtime: Purge snprintf
We are writting cpp for these operations we should be using std:string
and boost:format. This also cleans up some compiler warnings about
possible string truncation.
Signed-off-by: Brennan Ashton <bashton@brennanashton.com>
Also, removing the `HAVE_SNPRINT` check around the now snprintf-free
handling
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
Diffstat (limited to 'gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc')
| -rw-r--r-- | gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc index 94f0a26f11..7d63dc08d1 100644 --- a/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc +++ b/gnuradio-runtime/lib/vmcircbuf_mmap_shm_open.cc @@ -39,6 +39,7 @@ #include <gnuradio/sys_paths.h> #include <errno.h> #include <stdio.h> +#include <boost/format.hpp> namespace gr { @@ -58,7 +59,7 @@ vmcircbuf_mmap_shm_open::vmcircbuf_mmap_shm_open(int size) : gr::vmcircbuf(size) } int shm_fd = -1; - char seg_name[1024]; + std::string seg_name; static bool portable_format = true; // open a new named shared memory segment @@ -67,23 +68,17 @@ vmcircbuf_mmap_shm_open::vmcircbuf_mmap_shm_open(int size) : gr::vmcircbuf(size) // This is the POSIX recommended "portable format". // Of course the "portable format" doesn't work on some systems... - - snprintf( - seg_name, sizeof(seg_name), "/gnuradio-%d-%d", getpid(), s_seg_counter); + seg_name = str(boost::format("/gnuradio-%d-%d") % getpid() % s_seg_counter); } else { // Where the "portable format" doesn't work, we try building // a full filesystem pathname pointing into a suitable temporary directory. - snprintf(seg_name, - sizeof(seg_name), - "%s/gnuradio-%d-%d", - gr::tmp_path(), - getpid(), - s_seg_counter); + seg_name = str(boost::format("%s/gnuradio-%d-%d") % + gr::tmp_path() % getpid() % s_seg_counter); } - shm_fd = shm_open(seg_name, O_RDWR | O_CREAT | O_EXCL, 0600); + shm_fd = shm_open(seg_name.c_str(), O_RDWR | O_CREAT | O_EXCL, 0600); if (shm_fd == -1 && errno == EACCES && portable_format) { portable_format = false; continue; // try again using "non-portable format" @@ -96,10 +91,10 @@ vmcircbuf_mmap_shm_open::vmcircbuf_mmap_shm_open(int size) : gr::vmcircbuf(size) EEXIST) // Named segment already exists (shouldn't happen). Try again continue; - char msg[1024]; - snprintf( - msg, sizeof(msg), "gr::vmcircbuf_mmap_shm_open: shm_open [%s]", seg_name); - perror(msg); + static std::string msg = + str(boost::format("gr::vmcircbuf_mmap_shm_open: shm_open [%s]") % + seg_name); + perror(msg.c_str()); throw std::runtime_error("gr::vmcircbuf_mmap_shm_open"); } break; @@ -156,7 +151,7 @@ vmcircbuf_mmap_shm_open::vmcircbuf_mmap_shm_open(int size) : gr::vmcircbuf(size) close(shm_fd); // fd no longer needed. The mapping is retained. - if (shm_unlink(seg_name) == -1) { // unlink the seg_name. + if (shm_unlink(seg_name.c_str()) == -1) { // unlink the seg_name. perror("gr::vmcircbuf_mmap_shm_open: shm_unlink"); throw std::runtime_error("gr::vmcircbuf_mmap_shm_open"); } |