fixing bugs, changing some code from char arrays to c++ std::string

This commit is contained in:
jakani24
2024-03-13 19:10:31 +01:00
parent 717c7956f5
commit 41e0889a6e
38 changed files with 1242 additions and 1038 deletions

View File

@@ -1,45 +1,44 @@
#ifndef QUEUE_CTRL_CPP
#define QUEUE_CTRL_CPP
#include "queue_ctrl.h"
#include <string.h>
#define queue_limit 1000
#define command_limit 3000
char queue[queue_limit][command_limit];
#include <cstring>
#include <string>
#include <array>
constexpr int queue_limit = 1000;
std::array<std::string, queue_limit> queue;
int queue_size = 0;
int queue_start = 0;
int queue_end = 0;
int queue_push(char* str) {
if (queue_size == queue_limit) {
return 1;
}
else if (strlen(str) >= command_limit) {
return 2;
}
else {
strcpy_s(queue[queue_end], str);
queue_end++;
queue_size++;
if (queue_end == queue_limit) {
queue_end = 0;
}
return 0;
}
int queue_push(const std::string& str) {
if (queue_size == queue_limit) {
return 1; // Queue full
}
else {
queue[queue_end] = str;
queue_end = (queue_end + 1) % queue_limit;
queue_size++;
return 0; // Success
}
}
int queue_pop(char* str) {
if (queue_size == 0) {
return 1;
}
else {
strcpy_s(str, 100, queue[queue_start]);
queue_start++;
queue_size--;
if (queue_start == queue_limit) {
queue_start = 0;
}
return 0;
}
std::string queue_pop() {
if (queue_size == 0) {
return "nan"; // Queue empty
}
else {
std::string ret = queue[queue_end-1];
queue_end = (queue_end - 1) % queue_limit;
queue_size--;
return ret; // Success
}
}
int get_queue_size() {
return queue_size;
return queue_size;
}
#endif // !QUEUE_CTRL_CPP