consolidate version_information

epics-base · Jul 25, 2023 · a2edecd · a2edecd
1 parent f5657e5
commit a2edecd
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 24 deletions.
diff --git a/src/describe.cpp b/src/describe.cpp
@@ -132,4 +132,12 @@ std::ostream& target_information(std::ostream& strm)
     return strm;
 }
 
+std::ostream& version_information(std::ostream& strm)
+{
+    strm<<version_str()<<"\n";
+    strm<<EPICS_VERSION_STRING<<"\n";
+    strm<<"libevent "<<event_get_version()<<"\n";
+    return strm;
+}
+
 } // namespace pvxs
diff --git a/src/pvxs/util.h b/src/pvxs/util.h
@@ -179,6 +179,17 @@ struct PVXS_API Detailed {
 PVXS_API
 std::ostream& target_information(std::ostream&);
 
+/** Print version information for PVXS library and dependencies
+ *
+ * As shown by eg. ``pvxget -V``
+ *
+ * @returns The same ostream passed as argument.
+ *
+ * @since UNRELEASED
+ */
+PVXS_API
+std::ostream& version_information(std::ostream&);
+
 /** Thread-safe, bounded, multi-producer, multi-consumer FIFO queue.
  *
  * Queue value_type must be movable.  If T is also copy constructable,

diff --git a/tools/call.cpp b/tools/call.cpp
@@ -52,9 +52,7 @@ int main(int argc, char *argv[])
                     usage(argv[0]);
                     return 0;
                 case 'V':
-                    std::cout<<version_str()<<"\n";
-                    std::cout<<EPICS_VERSION_STRING<<"\n";
-                    std::cout<<"libevent "<<event_get_version()<<"\n";
+                    std::cout<<pvxs::version_information;
                     return 0;
                 case 'v':
                     verbose = true;

diff --git a/tools/get.cpp b/tools/get.cpp
@@ -60,9 +60,7 @@ int main(int argc, char *argv[])
                     usage(argv[0]);
                     return 0;
                 case 'V':
-                    std::cout<<version_str()<<"\n";
-                    std::cout<<EPICS_VERSION_STRING<<"\n";
-                    std::cout<<"libevent "<<event_get_version()<<"\n";
+                    std::cout<<pvxs::version_information;
                     return 0;
                 case 'v':
                     verbose = true;

diff --git a/tools/info.cpp b/tools/info.cpp
@@ -51,9 +51,7 @@ int main(int argc, char *argv[])
                     usage(argv[0]);
                     return 0;
                 case 'V':
-                    std::cout<<version_str()<<"\n";
-                    std::cout<<EPICS_VERSION_STRING<<"\n";
-                    std::cout<<"libevent "<<event_get_version()<<"\n";
+                    std::cout<<pvxs::version_information;
                     return 0;
                 case 'v':
                     verbose = true;

diff --git a/tools/list.cpp b/tools/list.cpp
@@ -78,9 +78,7 @@ int main(int argc, char *argv[])
                     usage(argv[0]);
                     return 0;
                 case 'V':
-                    std::cout<<version_str()<<"\n";
-                    std::cout<<EPICS_VERSION_STRING<<"\n";
-                    std::cout<<"libevent "<<event_get_version()<<"\n";
+                    std::cout<<pvxs::version_information;
                     return 0;
                 case 'A':
                     active = true;

diff --git a/tools/monitor.cpp b/tools/monitor.cpp
@@ -60,9 +60,7 @@ int main(int argc, char *argv[])
                     usage(argv[0]);
                     return 0;
                 case 'V':
-                    std::cout<<version_str()<<"\n";
-                    std::cout<<EPICS_VERSION_STRING<<"\n";
-                    std::cout<<"libevent "<<event_get_version()<<"\n";
+                    std::cout<<pvxs::version_information;
                     return 0;
                 case 'v':
                     verbose = true;

diff --git a/tools/mshim.cpp b/tools/mshim.cpp
@@ -266,9 +266,7 @@ int main(int argc, char *argv[])
                     usage(argv[0]);
                     return 0;
                 case 'V':
-                    std::cout<<version_str()<<"\n";
-                    std::cout<<EPICS_VERSION_STRING<<"\n";
-                    std::cout<<"libevent "<<event_get_version()<<std::endl;
+                    std::cout<<pvxs::version_information;
                     return 0;
                 default:
                     usage(argv[0]);

diff --git a/tools/put.cpp b/tools/put.cpp
@@ -52,9 +52,7 @@ int main(int argc, char *argv[])
                     usage(argv[0]);
                     return 0;
                 case 'V':
-                    std::cout<<version_str()<<"\n";
-                    std::cout<<EPICS_VERSION_STRING<<"\n";
-                    std::cout<<"libevent "<<event_get_version()<<"\n";
+                    std::cout<<pvxs::version_information;
                     return 0;
                 case 'v':
                     verbose = true;

diff --git a/tools/pvxvct.cpp b/tools/pvxvct.cpp
@@ -21,6 +21,7 @@
 #include <osiSock.h>
 
 #include <pvxs/log.h>
+#include <pvxs/util.h>
 
 #include <udp_collector.h>
 #include <utilpvt.h>
@@ -133,9 +134,7 @@ int main(int argc, char *argv[])
                     usage(argv[0]);
                     return 0;
                 case 'V':
-                    std::cout<<pva::version_str()<<"\n";
-                    std::cout<<EPICS_VERSION_STRING<<"\n";
-                    std::cout<<"libevent "<<event_get_version()<<"\n";
+                    std::cout<<pvxs::version_information;
                     return 0;
                 default:
                     usage(argv[0]);