Browse Source

Fixed compilation

Paul-Louis Ageneau 5 years ago
parent
commit
df2102497d
2 changed files with 76 additions and 90 deletions
  1. 38 44
      examples/copy-paste-capi/answerer.c
  2. 38 46
      examples/copy-paste-capi/offerer.c

+ 38 - 44
examples/copy-paste-capi/answerer.c

@@ -42,24 +42,18 @@ typedef struct {
 } Peer;
 } Peer;
 
 
 static void dataChannelCallback(int dc, void *ptr);
 static void dataChannelCallback(int dc, void *ptr);
-
 static void descriptionCallback(const char *sdp, const char *type, void *ptr);
 static void descriptionCallback(const char *sdp, const char *type, void *ptr);
-
 static void candidateCallback(const char *cand, const char *mid, void *ptr);
 static void candidateCallback(const char *cand, const char *mid, void *ptr);
-
 static void stateChangeCallback(rtcState state, void *ptr);
 static void stateChangeCallback(rtcState state, void *ptr);
-
 static void gatheringStateCallback(rtcGatheringState state, void *ptr);
 static void gatheringStateCallback(rtcGatheringState state, void *ptr);
-
 static void closedCallback(void *ptr);
 static void closedCallback(void *ptr);
-
 static void messageCallback(const char *message, int size, void *ptr);
 static void messageCallback(const char *message, int size, void *ptr);
-
 static void deletePeer(Peer *peer);
 static void deletePeer(Peer *peer);
 
 
-int all_space(const char *str);
 char* state_print(rtcState state);
 char* state_print(rtcState state);
-char* rtcGatheringState_print(rtcState state);
+char *rtcGatheringState_print(rtcGatheringState state);
+
+int all_space(const char *str);
 
 
 int main(int argc, char **argv) {
 int main(int argc, char **argv) {
 	rtcInitLogger(RTC_LOG_DEBUG, NULL);
 	rtcInitLogger(RTC_LOG_DEBUG, NULL);
@@ -257,42 +251,32 @@ static void dataChannelCallback(int dc, void *ptr) {
                 printf("DataChannel %s: Received with label \"%s\"\n", "answerer", buffer);
                 printf("DataChannel %s: Received with label \"%s\"\n", "answerer", buffer);
 }
 }
 
 
-int all_space(const char *str) {
-        while (*str) {
-                if (!isspace(*str++)) {
-                        return 0;
-                }
-        }
-
-	    return 1;
-}
-
-char* state_print(rtcState state) {
-        char *str = NULL;
-        switch (state) {
-        case RTC_NEW:
-                str = "RTC_NEW";
-                break;
-        case RTC_CONNECTING:
-                str = "RTC_CONNECTING";
-                break;
-        case RTC_CONNECTED:
-                str = "RTC_CONNECTED";
-                break;
-        case RTC_DISCONNECTED:
-                str = "RTC_DISCONNECTED";
-                break;
-        case RTC_FAILED:
-                str = "RTC_FAILED";
-                break;
-        case RTC_CLOSED:
-                str = "RTC_CLOSED";
-                break;
-        default:
-                break;
-        }
+char *state_print(rtcState state) {
+	char *str = NULL;
+	switch (state) {
+	case RTC_NEW:
+		str = "RTC_NEW";
+		break;
+	case RTC_CONNECTING:
+		str = "RTC_CONNECTING";
+		break;
+	case RTC_CONNECTED:
+		str = "RTC_CONNECTED";
+		break;
+	case RTC_DISCONNECTED:
+		str = "RTC_DISCONNECTED";
+		break;
+	case RTC_FAILED:
+		str = "RTC_FAILED";
+		break;
+	case RTC_CLOSED:
+		str = "RTC_CLOSED";
+		break;
+	default:
+		break;
+	}
 
 
-        return str;
+	return str;
 }
 }
 
 
 char *rtcGatheringState_print(rtcGatheringState state) {
 char *rtcGatheringState_print(rtcGatheringState state) {
@@ -313,3 +297,13 @@ char *rtcGatheringState_print(rtcGatheringState state) {
 
 
 	return str;
 	return str;
 }
 }
+
+int all_space(const char *str) {
+	while (*str) {
+		if (!isspace(*str++)) {
+			return 0;
+		}
+	}
+
+	return 1;
+}

+ 38 - 46
examples/copy-paste-capi/offerer.c

@@ -33,9 +33,6 @@ static void sleep(unsigned int secs) { Sleep(secs * 1000); }
 #include <unistd.h> // for sleep
 #include <unistd.h> // for sleep
 #endif
 #endif
 
 
-char* state_print(rtcState state);
-char* rtcGatheringState_print(rtcState state);
-
 typedef struct {
 typedef struct {
         rtcState state;
         rtcState state;
         rtcGatheringState gatheringState;
         rtcGatheringState gatheringState;
@@ -45,21 +42,17 @@ typedef struct {
 } Peer;
 } Peer;
 
 
 static void descriptionCallback(const char *sdp, const char *type, void *ptr);
 static void descriptionCallback(const char *sdp, const char *type, void *ptr);
-
 static void candidateCallback(const char *cand, const char *mid, void *ptr);
 static void candidateCallback(const char *cand, const char *mid, void *ptr);
-
 static void stateChangeCallback(rtcState state, void *ptr);
 static void stateChangeCallback(rtcState state, void *ptr);
-
 static void gatheringStateCallback(rtcGatheringState state, void *ptr);
 static void gatheringStateCallback(rtcGatheringState state, void *ptr);
-
 static void openCallback(void *ptr);
 static void openCallback(void *ptr);
-
 static void closedCallback(void *ptr);
 static void closedCallback(void *ptr);
-
 static void messageCallback(const char *message, int size, void *ptr);
 static void messageCallback(const char *message, int size, void *ptr);
-
 static void deletePeer(Peer *peer);
 static void deletePeer(Peer *peer);
 
 
+char *state_print(rtcState state);
+char *rtcGatheringState_print(rtcGatheringState state);
+
 int all_space(const char *str);
 int all_space(const char *str);
 
 
 int main(int argc, char **argv){
 int main(int argc, char **argv){
@@ -261,43 +254,32 @@ static void deletePeer(Peer *peer) {
         }
         }
 }
 }
 
 
-int all_space(const char *str) {
-        while (*str) {
-                if (!isspace(*str++)) {
-                        return 0;
-                }
-        }
-
-	    return 1;
-}
-
-char* state_print(rtcState state) {
-        char *str = NULL;
-        switch (state) {
-        case RTC_NEW:
-                str = "RTC_NEW";
-                break;
-        case RTC_CONNECTING:
-                str = "RTC_CONNECTING";
-                break;
-        case RTC_CONNECTED:
-                str = "RTC_CONNECTED";
-                break;
-        case RTC_DISCONNECTED:
-                str = "RTC_DISCONNECTED";
-                break;
-        case RTC_FAILED:
-                str = "RTC_FAILED";
-                break;
-        case RTC_CLOSED:
-                str = "RTC_CLOSED";
-                break;
-        default:
-                break;
-        }
-
-        return str;
+char *state_print(rtcState state) {
+	char *str = NULL;
+	switch (state) {
+	case RTC_NEW:
+		str = "RTC_NEW";
+		break;
+	case RTC_CONNECTING:
+		str = "RTC_CONNECTING";
+		break;
+	case RTC_CONNECTED:
+		str = "RTC_CONNECTED";
+		break;
+	case RTC_DISCONNECTED:
+		str = "RTC_DISCONNECTED";
+		break;
+	case RTC_FAILED:
+		str = "RTC_FAILED";
+		break;
+	case RTC_CLOSED:
+		str = "RTC_CLOSED";
+		break;
+	default:
+		break;
+	}
 
 
+	return str;
 }
 }
 
 
 char *rtcGatheringState_print(rtcGatheringState state) {
 char *rtcGatheringState_print(rtcGatheringState state) {
@@ -318,3 +300,13 @@ char *rtcGatheringState_print(rtcGatheringState state) {
 
 
 	return str;
 	return str;
 }
 }
+
+int all_space(const char *str) {
+	while (*str) {
+		if (!isspace(*str++)) {
+			return 0;
+		}
+	}
+
+	return 1;
+}