Removed unnecessary functions
This commit is contained in:
@@ -2,36 +2,44 @@
|
||||
|
||||
#include "message_helpers.h"
|
||||
|
||||
char* fetch_dest_user_string(char* message) {
|
||||
char* token = malloc (sizeof(char) * strlen(message));
|
||||
token = strtok(message," \r\n");
|
||||
if (strcmp(token,"TO:") == 0) {
|
||||
token = strtok(NULL," \r\n");
|
||||
} else {
|
||||
return NULL;
|
||||
}
|
||||
char* fetch_from_string(char* message, char* indicator) {
|
||||
|
||||
return token;
|
||||
}
|
||||
char* message_copy = malloc(strlen(message));
|
||||
strcpy(message_copy,message);
|
||||
|
||||
char* fetch_sender_user_string(char* message) {
|
||||
fetch_generic_string("IAM",message);
|
||||
}
|
||||
|
||||
char* fetch_generic_string(char* indicator, char* message) {
|
||||
char* token = malloc (sizeof(char) * strlen(message));
|
||||
char* token = malloc (sizeof(char) * strlen(message_copy));
|
||||
|
||||
char* string_to_search = malloc(strlen(indicator) + 1);
|
||||
strcpy(string_to_search,indicator);
|
||||
strcat(string_to_search,":");
|
||||
|
||||
token = strtok(message," r\n");
|
||||
if (strcmp(token,string_to_search) == 0) {
|
||||
token = strtok(NULL," \r\n");
|
||||
} else {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
token = strtok(message_copy," r\n");
|
||||
while (strcmp(token,string_to_search) != 0) {
|
||||
token = strtok(NULL," \r\n");
|
||||
if (token == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
token = strtok(NULL," \r\n");
|
||||
return token;
|
||||
|
||||
}
|
||||
|
||||
char* fetch_message_string(char* message) {
|
||||
char* start = strstr(message,"START_OF_MESSAGE");
|
||||
if (start == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
int start_index = start - message;
|
||||
|
||||
char* end = strstr(message,"END_OF_MESSAGE");
|
||||
if (end == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
int end_index = end - message;
|
||||
|
||||
int message_length = end_index - start_index;
|
||||
char* message_string = malloc(message_length + 1);
|
||||
|
||||
for (int i=0;i < message_length; i++) {
|
||||
*(message_string + i) = *(message_
|
||||
}
|
||||
|
@@ -1,21 +1,12 @@
|
||||
|
||||
|
||||
/* If the message contains a string of the form:
|
||||
TO: <Username>
|
||||
then return 'Username' */
|
||||
char* fetch_dest_user_string(char* message);
|
||||
|
||||
/* If the message contains a string of the form:
|
||||
IAM: <Username>
|
||||
then return 'Username' */
|
||||
char* fetch_sender_user_string(char* message);
|
||||
|
||||
/* If the message contains a string of the form:
|
||||
<Indicator>: <Value>
|
||||
Then return 'value' */
|
||||
char* fetch_generic_string(char* indicator, char* message);
|
||||
char* fetch_from_string(char* message, char* indicator);
|
||||
|
||||
/* If the message contains a string of the form:
|
||||
START_OF_MESSAGE
|
||||
<text>
|
||||
END_OF_MESSAGE
|
||||
Then return <text> */
|
||||
char* fetch_message_string(char* message);
|
||||
|
Reference in New Issue
Block a user