Ofx osc tweaks [needs #7620] (#7658)

#changelog #addon

Author: artificiel

addons/ofxOsc/libs/oscpack/src/ip/IpEndpointName.cpp

@@ -51,9 +51,9 @@ unsigned long IpEndpointName::GetHostByName( const char *s )
 void IpEndpointName::AddressAsString( char *s ) const
 {
 	if( address == ANY_ADDRESS ){
-		std::sprintf( s, "<any>" );
+		std::snprintf( s, ADDRESS_STRING_LENGTH, "<any>" );
 	}else{
-		std::sprintf( s, "%d.%d.%d.%d",
+		std::snprintf( s, ADDRESS_STRING_LENGTH, "%d.%d.%d.%d",
 				(int)((address >> 24) & 0xFF),
 				(int)((address >> 16) & 0xFF),
 				(int)((address >> 8) & 0xFF),
@@ -66,25 +66,25 @@ void IpEndpointName::AddressAndPortAsString( char *s ) const
 {
 	if( port == ANY_PORT ){
 		if( address == ANY_ADDRESS ){
-			std::sprintf( s, "<any>:<any>" );
+			std::snprintf( s, ADDRESS_AND_PORT_STRING_LENGTH, "<any>:<any>" );
 		}else{
-			std::sprintf( s, "%d.%d.%d.%d:<any>",
+			std::snprintf( s, ADDRESS_AND_PORT_STRING_LENGTH, "%d.%d.%d.%d:<any>",
 				(int)((address >> 24) & 0xFF),
 				(int)((address >> 16) & 0xFF),
 				(int)((address >> 8) & 0xFF),
 				(int)(address & 0xFF) );
 		}
 	}else{
 		if( address == ANY_ADDRESS ){
-			std::sprintf( s, "<any>:%d", port );
+			std::snprintf( s, ADDRESS_AND_PORT_STRING_LENGTH, "<any>:%d", port );
 		}else{
-			std::sprintf( s, "%d.%d.%d.%d:%d",
+			std::snprintf( s, ADDRESS_AND_PORT_STRING_LENGTH, "%d.%d.%d.%d:%d",
 				(int)((address >> 24) & 0xFF),
 				(int)((address >> 16) & 0xFF),
 				(int)((address >> 8) & 0xFF),
 				(int)(address & 0xFF),
 				(int)port );
 		}
-	}	
+	}
 }
 }

addons/ofxOsc/src/ofxOscBundle.cpp

@@ -1,81 +1,81 @@
-// copyright (c) openFrameworks team 2010-2017
+// copyright (c) openFrameworks team 2010-2023
 // copyright (c) Damian Stewart 2007-2009
 #include "ofxOscBundle.h"
 
 //--------------------------------------------------------------
-ofxOscBundle::ofxOscBundle(const ofxOscBundle &other){ 
+ofxOscBundle::ofxOscBundle(const ofxOscBundle & other) {
 	copy(other);
 }
 
 //--------------------------------------------------------------
-ofxOscBundle& ofxOscBundle::operator=(const ofxOscBundle &other){
+ofxOscBundle & ofxOscBundle::operator=(const ofxOscBundle & other) {
 	return copy(other);
 }
 
 //--------------------------------------------------------------
-ofxOscBundle& ofxOscBundle::copy(const ofxOscBundle &other){
-	if(this == &other) return *this;
+ofxOscBundle & ofxOscBundle::copy(const ofxOscBundle & other) {
+	if (this == &other) return *this;
 
 	std::copy(other.bundles.begin(),
-	          other.bundles.end(),
-	          std::back_inserter(bundles));
+		other.bundles.end(),
+		std::back_inserter(bundles));
 
 	std::copy(other.messages.begin(),
-	          other.messages.end(),
-	          std::back_inserter(messages));
+		other.messages.end(),
+		std::back_inserter(messages));
 
 	return *this;
 }
 
 //--------------------------------------------------------------
-void ofxOscBundle::clear(){
+void ofxOscBundle::clear() {
 	bundles.clear();
 	messages.clear();
 }
 
 //--------------------------------------------------------------
-void ofxOscBundle::addBundle(const ofxOscBundle &bundle){
+void ofxOscBundle::addBundle(const ofxOscBundle & bundle) {
 	bundles.push_back(bundle);
 }
 
 //--------------------------------------------------------------
-void ofxOscBundle::addMessage(const ofxOscMessage &message){
+void ofxOscBundle::addMessage(const ofxOscMessage & message) {
 	messages.push_back(message);
 }
 
 //--------------------------------------------------------------
-int ofxOscBundle::getBundleCount() const{ 
+std::size_t ofxOscBundle::getBundleCount() const {
 	return bundles.size();
 }
 
 //--------------------------------------------------------------
-int ofxOscBundle::getMessageCount() const{
+std::size_t ofxOscBundle::getMessageCount() const {
 	return messages.size();
 }
 
 //--------------------------------------------------------------
-const ofxOscBundle& ofxOscBundle::getBundleAt(std::size_t i) const{
+const ofxOscBundle & ofxOscBundle::getBundleAt(std::size_t i) const {
 	return bundles[i];
 }
 
 //--------------------------------------------------------------
-ofxOscBundle& ofxOscBundle::getBundleAt(std::size_t i){
+ofxOscBundle & ofxOscBundle::getBundleAt(std::size_t i) {
 	return bundles[i];
 }
 
 //--------------------------------------------------------------
-const ofxOscMessage& ofxOscBundle::getMessageAt(std::size_t i) const{
+const ofxOscMessage & ofxOscBundle::getMessageAt(std::size_t i) const {
 	return messages[i];
 }
 
 //--------------------------------------------------------------
-ofxOscMessage& ofxOscBundle::getMessageAt(std::size_t i){
+ofxOscMessage & ofxOscBundle::getMessageAt(std::size_t i) {
 	return messages[i];
 }
 
 // friend functions
 //--------------------------------------------------------------
-std::ostream& operator<<(std::ostream &os, const ofxOscBundle &bundle) {
+std::ostream & operator<<(std::ostream & os, const ofxOscBundle & bundle) {
 	os << bundle.getMessageCount() << " message(s) "
 	   << bundle.getBundleCount() << " bundle(s)";
 	return os;

addons/ofxOsc/src/ofxOscBundle.h

@@ -1,53 +1,51 @@
-// copyright (c) openFrameworks team 2010-2017
+// copyright (c) openFrameworks team 2010-2023
 // copyright (c) Damian Stewart 2007-2009
 #pragma once
 
 #include "ofxOscMessage.h"
 
 /// \class ofxOscBundle
 /// \brief an OSC bundle of ofxOscMessages and/or other ofxOscBundles
-class ofxOscBundle{
+class ofxOscBundle {
 public:
-
-	ofxOscBundle() {}
-	ofxOscBundle(const ofxOscBundle& other);
-	ofxOscBundle& operator=(const ofxOscBundle &other);
+	ofxOscBundle() { }
+	ofxOscBundle(const ofxOscBundle & other);
+	ofxOscBundle & operator=(const ofxOscBundle & other);
 	/// for operator= and copy constructor
-	ofxOscBundle& copy(const ofxOscBundle &other);
+	ofxOscBundle & copy(const ofxOscBundle & other);
 
 	/// clear bundle & message contents
 	void clear();
 
 	/// add another bundle to the bundle
-	void addBundle(const ofxOscBundle &element);
+	void addBundle(const ofxOscBundle & element);
 
 	/// add a message to the bundle
-	void addMessage(const ofxOscMessage &message);
+	void addMessage(const ofxOscMessage & message);
 
 	/// \return the current bundle count
-	int getBundleCount() const;
+	std::size_t getBundleCount() const;
 
 	/// \return the current message count
-	int getMessageCount() const;
+	std::size_t getMessageCount() const;
 
 	/// \return the bundle at the given index
-	const ofxOscBundle& getBundleAt(std::size_t i) const;
+	const ofxOscBundle & getBundleAt(std::size_t i) const;
 
 	/// \return the bundle at the given index
-	ofxOscBundle& getBundleAt(std::size_t i);
+	ofxOscBundle & getBundleAt(std::size_t i);
 
 	/// \return the message at the given index
-	const ofxOscMessage& getMessageAt(std::size_t i) const;
+	const ofxOscMessage & getMessageAt(std::size_t i) const;
 
 	/// \return the message at the given index
-	ofxOscMessage& getMessageAt(std::size_t i);
+	ofxOscMessage & getMessageAt(std::size_t i);
 
 	/// output stream operator for string conversion and printing
 	/// \return number of messages & bundles
-	friend std::ostream& operator<<(std::ostream &os, const ofxOscBundle &sender);
+	friend std::ostream & operator<<(std::ostream & os, const ofxOscBundle & sender);
 
 private:
-
 	std::vector<ofxOscMessage> messages; ///< bundled messages
 	std::vector<ofxOscBundle> bundles; ///< bundled bundles
 };