Bladeren bron

Minor updates...

master
Ognjen Milan Robovic 8 maanden geleden
bovenliggende
commit
7f36fa2d60
2 gewijzigde bestanden met toevoegingen van 37 en 15 verwijderingen
  1. +35
    -15
      xtandard.c
  2. +2
    -0
      xtandard.h

+ 35
- 15
xtandard.c Bestand weergeven

@@ -182,6 +182,8 @@ void argument_delete (void) {
}

void file_list_import (char * name) {
fatal_failure (name == NULL, "file_list_import: Failed to open file, name is null pointer.");

++file_list_count;

file_list_active = file_list_count - 1;
@@ -202,6 +204,8 @@ void file_list_import (char * name) {

file_list_mark [file_list_count - 1] = open (name, O_RDONLY);

fatal_failure (file_list_mark [file_list_count - 1] == -1, "file_list_import: Failed to open file, standard library failure.");

file_list_size [file_list_count - 1] = (int) lseek (file_list_mark [file_list_count - 1], 0, SEEK_END) + 1;

(void) lseek (file_list_mark [file_list_count - 1], 0, SEEK_SET);
@@ -305,7 +309,7 @@ void file_export (char * name, void * data) {
int string_length (char * string) {
int length = 0;

fatal_failure (string == NULL, "string_length: String is null.");
fatal_failure (string == NULL, "string_length: String is null pointer.");

for (length = 0; string [length] != '\0'; ++length);

@@ -316,7 +320,7 @@ void string_reverse (char * string) {
int i = 0;
int length = 0;

fatal_failure (string == NULL, "string_reverse: String is null.");
fatal_failure (string == NULL, "string_reverse: String is null pointer.");

length = string_length (string);

@@ -328,7 +332,7 @@ void string_reverse (char * string) {
void string_delete (char * string, int length) {
int i;

fatal_failure (string == NULL, "string_delete: String is null.");
fatal_failure (string == NULL, "string_delete: String is null pointer.");
fatal_failure (length == 0, "string_delete: String length is zero.");

for (i = 0; i != length; ++i) {
@@ -339,8 +343,8 @@ void string_delete (char * string, int length) {
int string_compare (char * string_0, char * string_1) {
int i = 0;

fatal_failure (string_0 == NULL, "string_compare: Destination string is null.");
fatal_failure (string_1 == NULL, "string_compare: Source string is null.");
fatal_failure (string_0 == NULL, "string_compare: Destination string is null pointer.");
fatal_failure (string_1 == NULL, "string_compare: Source string is null pointer.");

for (i = 0; (string_0 [i] != '\0') && (string_1 [i] != '\0'); ++i) {
if (string_0 [i] != string_1 [i]) {
@@ -355,8 +359,8 @@ void string_copy (char * string_0, char * string_1) {
int i = 0;
int length = 0;

fatal_failure (string_0 == NULL, "string_copy: Destination string is null.");
fatal_failure (string_1 == NULL, "string_copy: Source string is null.");
fatal_failure (string_0 == NULL, "string_copy: Destination string is null pointer.");
fatal_failure (string_1 == NULL, "string_copy: Source string is null pointer.");

length = string_length (string_1);

@@ -370,8 +374,8 @@ void string_concatenate (char * string_0, char * string_1) {
int length_0 = 0;
int length_1 = 0;

fatal_failure (string_0 == NULL, "string_concatenate: Destination string is null.");
fatal_failure (string_1 == NULL, "string_concatenate: Source string is null.");
fatal_failure (string_0 == NULL, "string_concatenate: Destination string is null pointer.");
fatal_failure (string_1 == NULL, "string_concatenate: Source string is null pointer.");

length_0 = string_length (string_0);
length_1 = string_length (string_1);
@@ -384,8 +388,8 @@ void string_concatenate (char * string_0, char * string_1) {
int string_compare_limit (char * string_0, char * string_1, int limit) {
int i = 0;

fatal_failure (string_0 == NULL, "string_compare_limit: Destination string is null.");
fatal_failure (string_1 == NULL, "string_compare_limit: Source string is null.");
fatal_failure (string_0 == NULL, "string_compare_limit: Destination string is null pointer.");
fatal_failure (string_1 == NULL, "string_compare_limit: Source string is null pointer.");

for (i = 0; i != limit; ++i) {
if (string_0 [i] != string_1 [i]) {
@@ -399,8 +403,8 @@ int string_compare_limit (char * string_0, char * string_1, int limit) {
void string_copy_limit (char * string_0, char * string_1, int limit) {
int i = 0;

fatal_failure (string_0 == NULL, "string_copy_limit: Destination string is null.");
fatal_failure (string_1 == NULL, "string_copy_limit: Source string is null.");
fatal_failure (string_0 == NULL, "string_copy_limit: Destination string is null pointer.");
fatal_failure (string_1 == NULL, "string_copy_limit: Source string is null pointer.");

if (limit <= 0) {
return;
@@ -416,8 +420,8 @@ void string_concatenate_limit (char * string_0, char * string_1, int limit) {
int length_0 = 0;
int length_1 = 0;

fatal_failure (string_0 == NULL, "string_concatenate_limit: Destination string is null.");
fatal_failure (string_1 == NULL, "string_concatenate_limit: Source string is null.");
fatal_failure (string_0 == NULL, "string_concatenate_limit: Destination string is null pointer.");
fatal_failure (string_1 == NULL, "string_concatenate_limit: Source string is null pointer.");

if (limit <= 0) {
return;
@@ -431,4 +435,20 @@ void string_concatenate_limit (char * string_0, char * string_1, int limit) {
}
}

int string_split_space (char * string) {
int i = 0;
int count = 0;

fatal_failure (string == NULL, "string_split_space: Source string is null pointer.");

for (i = 0; string [i] != '\0'; ++i) {
if ((string [i] == ' ') || (string [i] == '\t') || (string [i] == '\n')) {
string [i] = '\0';
++count;
}
}

return (++count);
}

#endif

+ 2
- 0
xtandard.h Bestand weergeven

@@ -91,4 +91,6 @@ extern int string_compare_limit (char *, char *, int);
extern void string_copy_limit (char *, char *, int);
extern void string_concatenate_limit (char *, char *, int);

extern int string_split_space (char *);

#endif

Laden…
Annuleren
Opslaan