aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/environment.h6
-rw-r--r--include/str.h14
-rw-r--r--src/str.c8
3 files changed, 14 insertions, 14 deletions
diff --git a/include/environment.h b/include/environment.h
index 254c430..ad53bf0 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -1,8 +1,8 @@
/**
* @file environment.h
*/
-#ifndef SPM_ENVIRONMENT_H
-#define SPM_ENVIRONMENT_H
+#ifndef OHMYCAL_ENVIRONMENT_H
+#define OHMYCAL_ENVIRONMENT_H
#include <stdio.h>
#include <stdlib.h>
@@ -20,4 +20,4 @@ char *runtime_expand_var(RuntimeEnv *env, char *input);
void runtime_export(RuntimeEnv *env, char **keys);
void runtime_apply(RuntimeEnv *env);
void runtime_free(RuntimeEnv *env);
-#endif //SPM_ENVIRONMENT_H
+#endif //OHMYCAL_ENVIRONMENT_H
diff --git a/include/str.h b/include/str.h
index 1c67eda..d0fc819 100644
--- a/include/str.h
+++ b/include/str.h
@@ -1,8 +1,8 @@
/**
* @file str.h
*/
-#ifndef SPM_STR_H
-#define SPM_STR_H
+#ifndef OHMYCAL_STR_H
+#define OHMYCAL_STR_H
#include <stdio.h>
#include <stdlib.h>
@@ -11,10 +11,10 @@
#include <ctype.h>
#include "ohmycal.h"
-#define SPM_SORT_ALPHA 1 << 0
-#define SPM_SORT_NUMERIC 1 << 1
-#define SPM_SORT_LEN_ASCENDING 1 << 2
-#define SPM_SORT_LEN_DESCENDING 1 << 3
+#define OHMYCAL_SORT_ALPHA 1 << 0
+#define OHMYCAL_SORT_NUMERIC 1 << 1
+#define OHMYCAL_SORT_LEN_ASCENDING 1 << 2
+#define OHMYCAL_SORT_LEN_DESCENDING 1 << 3
int num_chars(const char *sptr, int ch);
int startswith(const char *sptr, const char *pattern);
@@ -44,4 +44,4 @@ int isdigit_s(const char *s);
char *tolower_s(char *s);
char *to_short_version(const char *s);
-#endif //SPM_STR_H
+#endif //OHMYCAL_STR_H
diff --git a/src/str.c b/src/str.c
index c9c6767..8e52611 100644
--- a/src/str.c
+++ b/src/str.c
@@ -488,13 +488,13 @@ void strsort(char **arr, unsigned int sort_mode) {
// Default mode is alphabetic sort
compar fn = _strsort_alpha_compare;
- if (sort_mode == SPM_SORT_LEN_DESCENDING) {
+ if (sort_mode == OHMYCAL_SORT_LEN_DESCENDING) {
fn = _strsort_dsc_compare;
- } else if (sort_mode == SPM_SORT_LEN_ASCENDING) {
+ } else if (sort_mode == OHMYCAL_SORT_LEN_ASCENDING) {
fn = _strsort_asc_compare;
- } else if (sort_mode == SPM_SORT_ALPHA) {
+ } else if (sort_mode == OHMYCAL_SORT_ALPHA) {
fn = _strsort_alpha_compare; // ^ still selectable though ^
- } else if (sort_mode == SPM_SORT_NUMERIC) {
+ } else if (sort_mode == OHMYCAL_SORT_NUMERIC) {
fn = _strsort_numeric_compare;
}