From: Kevin Day Date: Wed, 26 Nov 2025 06:51:54 +0000 (-0600) Subject: Update: Make some socket error codes more granular and add additional status codes. X-Git-Tag: 0.8.0~81 X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=26216e06aaabe9f0704040d2f92cbfbb810932c7;p=fll Update: Make some socket error codes more granular and add additional status codes. Some of the socket status codes should be more granular given the specific behavior relating to networking. Add error printing associated with this. I anticipate more changes like this based around networking. Add clock status codes. --- diff --git a/level_0/f_socket/c/socket.c b/level_0/f_socket/c/socket.c index c9a70fe..c91125d 100644 --- a/level_0/f_socket/c/socket.c +++ b/level_0/f_socket/c/socket.c @@ -14,7 +14,7 @@ extern "C" { if (result == -1) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EAGAIN || errno == EWOULDBLOCK) return F_status_set_error(F_block); + if (errno == EAGAIN || errno == EWOULDBLOCK) return F_status_set_error(F_socket_block); if (errno == EBADF) return F_status_set_error(F_file_descriptor); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == EHOSTDOWN) return F_status_set_error(F_network_client_not); @@ -25,7 +25,7 @@ extern "C" { if (errno == ENETDOWN) return F_status_set_error(F_network_not); if (errno == ENFILE) return F_status_set_error(F_file_open_max); if (errno == ENETUNREACH) return F_status_set_error(F_network_reach_not); - if (errno == ENOBUFS) return F_status_set_error(F_buffer_not); + if (errno == ENOBUFS) return F_status_set_error(F_buffer_sufficient_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); if (errno == ENONET) return F_status_set_error(F_network_device_not); if (errno == ENOPROTOOPT) return F_status_set_error(F_option_not); @@ -273,7 +273,7 @@ extern "C" { if (errno == EADDRINUSE) return F_status_set_error(F_busy_address); if (errno == EADDRNOTAVAIL) return F_status_set_error(F_available_not_address); if (errno == EAFNOSUPPORT) return F_status_set_error(F_domain_not); - if (errno == EAGAIN) return F_status_set_error(F_block); + if (errno == EAGAIN) return F_status_set_error(F_socket_block); if (errno == EALREADY) return F_status_set_error(F_complete_not); if (errno == EBADF) return F_status_set_error(F_file_descriptor); if (errno == ECONNREFUSED) return F_status_set_error(F_connect_refuse); @@ -308,7 +308,7 @@ extern "C" { if (errno == EINVAL) return F_status_set_error(F_parameter); if (errno == EMFILE) return F_status_set_error(F_file_descriptor_max); if (errno == ENFILE) return F_status_set_error(F_file_open_max); - if (errno == ENOBUFS) return F_status_set_error(F_buffer_not); + if (errno == ENOBUFS) return F_status_set_error(F_buffer_sufficient_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); if (errno == EPROTONOSUPPORT) return F_status_set_error(F_protocol_not); if (errno == ESOCKTNOSUPPORT) return F_status_set_error(F_type_not); @@ -337,7 +337,7 @@ extern "C" { if (errno == EINVAL) return F_status_set_error(F_parameter); if (errno == EMFILE) return F_status_set_error(F_file_descriptor_max); if (errno == ENFILE) return F_status_set_error(F_file_open_max); - if (errno == ENOBUFS) return F_status_set_error(F_buffer_not); + if (errno == ENOBUFS) return F_status_set_error(F_buffer_sufficient_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); if (errno == EPROTONOSUPPORT) return F_status_set_error(F_protocol_not); @@ -507,7 +507,7 @@ extern "C" { if (errno == EBADF) return F_status_set_error(F_file_descriptor); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == EINVAL) return F_status_set_error(F_parameter); - if (errno == ENOBUFS) return F_status_set_error(F_buffer_not); + if (errno == ENOBUFS) return F_status_set_error(F_buffer_sufficient_not); if (errno == ENOTCONN) return F_status_set_error(F_connect_not); if (errno == ENOTSOCK) return F_status_set_error(F_socket_not); @@ -531,7 +531,7 @@ extern "C" { if (result == -1) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EAGAIN || errno == EWOULDBLOCK) return F_status_set_error(F_block); + if (errno == EAGAIN || errno == EWOULDBLOCK) return F_status_set_error(F_socket_block); if (errno == EALREADY) return F_status_set_error(F_complete_not); if (errno == EBADF) return F_status_set_error(F_file_descriptor); if (errno == ECONNREFUSED) return F_status_set_error(F_connect_refuse); @@ -572,7 +572,7 @@ extern "C" { if (result == -1) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EAGAIN || errno == EWOULDBLOCK) return F_status_set_error(F_block); + if (errno == EAGAIN || errno == EWOULDBLOCK) return F_status_set_error(F_socket_block); if (errno == EALREADY) return F_status_set_error(F_complete_not); if (errno == EBADF) return F_status_set_error(F_file_descriptor); if (errno == ECONNREFUSED) return F_status_set_error(F_connect_refuse); @@ -613,7 +613,7 @@ extern "C" { if (result == -1) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EAGAIN || errno == EWOULDBLOCK) return F_status_set_error(F_block); + if (errno == EAGAIN || errno == EWOULDBLOCK) return F_status_set_error(F_socket_block); if (errno == EALREADY) return F_status_set_error(F_complete_not); if (errno == EBADF) return F_status_set_error(F_file_descriptor); if (errno == ECONNREFUSED) return F_status_set_error(F_connect_refuse); @@ -654,7 +654,7 @@ extern "C" { if (result == -1) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EAGAIN || errno == EWOULDBLOCK) return F_status_set_error(F_block); + if (errno == EAGAIN || errno == EWOULDBLOCK) return F_status_set_error(F_socket_block); if (errno == EALREADY) return F_status_set_error(F_complete_not); if (errno == EBADF) return F_status_set_error(F_file_descriptor); if (errno == ECONNREFUSED) return F_status_set_error(F_connect_refuse); @@ -665,7 +665,7 @@ extern "C" { if (errno == EINVAL) return F_status_set_error(F_parameter); if (errno == EISCONN) return F_status_set_error(F_connect); if (errno == EMSGSIZE) return F_status_set_error(F_size); - if (errno == ENOBUFS) return F_status_set_error(F_buffer_not); + if (errno == ENOBUFS) return F_status_set_error(F_buffer_sufficient_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); if (errno == ENOTCONN) return F_status_set_error(F_connect_not); if (errno == ENOTSOCK) return F_status_set_error(F_socket_not); @@ -698,7 +698,7 @@ extern "C" { if (result == -1) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EAGAIN || errno == EWOULDBLOCK) return F_status_set_error(F_block); + if (errno == EAGAIN || errno == EWOULDBLOCK) return F_status_set_error(F_socket_block); if (errno == EALREADY) return F_status_set_error(F_complete_not); if (errno == EBADF) return F_status_set_error(F_file_descriptor); if (errno == ECONNREFUSED) return F_status_set_error(F_connect_refuse); @@ -709,7 +709,7 @@ extern "C" { if (errno == EINVAL) return F_status_set_error(F_parameter); if (errno == EISCONN) return F_status_set_error(F_connect); if (errno == EMSGSIZE) return F_status_set_error(F_size); - if (errno == ENOBUFS) return F_status_set_error(F_buffer_not); + if (errno == ENOBUFS) return F_status_set_error(F_buffer_sufficient_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); if (errno == ENOTCONN) return F_status_set_error(F_connect_not); if (errno == ENOTSOCK) return F_status_set_error(F_socket_not); @@ -742,7 +742,7 @@ extern "C" { if (result == -1) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EAGAIN || errno == EWOULDBLOCK) return F_status_set_error(F_block); + if (errno == EAGAIN || errno == EWOULDBLOCK) return F_status_set_error(F_socket_block); if (errno == EALREADY) return F_status_set_error(F_complete_not); if (errno == EBADF) return F_status_set_error(F_file_descriptor); if (errno == ECONNREFUSED) return F_status_set_error(F_connect_refuse); @@ -753,7 +753,7 @@ extern "C" { if (errno == EINVAL) return F_status_set_error(F_parameter); if (errno == EISCONN) return F_status_set_error(F_connect); if (errno == EMSGSIZE) return F_status_set_error(F_size); - if (errno == ENOBUFS) return F_status_set_error(F_buffer_not); + if (errno == ENOBUFS) return F_status_set_error(F_buffer_sufficient_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); if (errno == ENOTCONN) return F_status_set_error(F_connect_not); if (errno == ENOTSOCK) return F_status_set_error(F_socket_not); diff --git a/level_0/f_socket/c/socket.h b/level_0/f_socket/c/socket.h index ae3050b..d37a610 100644 --- a/level_0/f_socket/c/socket.h +++ b/level_0/f_socket/c/socket.h @@ -71,9 +71,8 @@ extern "C" { * F_okay on success. * * F_access_denied (with error bit) on access denied. - * F_block (with error bit) if socket is blocked. * F_buffer (with error bit) if the buffer is invalid. - * F_buffer_not (with error bit) if unable to create socket due to resource restrictions (maps to ENOBUFS). + * F_buffer_sufficient_not (with error bit) if unable to create socket due to resource restrictions (maps to ENOBUFS). * F_file_descriptor (with error bit) if ID is an invalid descriptor. * F_file_descriptor_max (with error bit) if max file descriptors is reached. * F_file_open_max (with error bit) too many open files. @@ -89,6 +88,7 @@ extern "C" { * F_prohibited (with error bit) if the file system does not permit this operation. * F_protocol (with error bit) if a protocol error occurred. * F_protocol_not (with error bit) if the given protocol is unknown or is unsupported. + * F_socket_block (with error bit) if socket is blocked. * F_socket_not (with error bit) if the ID is not a socket descriptor. * F_stream_not (with error bit) the socket type is not a stream. * F_support_not (with error bit) if this socket type is not supported. @@ -185,7 +185,6 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_available_not_address (with error bit) if address is unavailable (is non-existent or not local). - * F_block (with error bit) if socket is blocked. * F_busy_address (with error bit) if address is already in use (therefore unavailable). * F_complete_not (with error bit) if a non-blocking connection attempt is not yet completed. * F_connect (with error bit) if already connected. @@ -198,6 +197,7 @@ extern "C" { * F_progress (with error bit) if if a non-blocking connection cannot be completed immediately. * F_prohibited (with error bit) if the file system does not permit this operation. * F_protocol_not (with error bit) if the given protocol is unknown or is unsupported. + * F_socket_block (with error bit) if socket is blocked. * F_socket_not (with error bit) if the ID is not a socket descriptor. * F_time_out (with error bit) if a timeout occurred. * @@ -226,7 +226,7 @@ extern "C" { * F_okay on success. * * F_access_denied (with error bit) on access denied. - * F_buffer_not (with error bit) if unable to create socket due to resource restrictions (maps to ENOBUFS). + * F_buffer_sufficient_not (with error bit) if unable to create socket due to resource restrictions (maps to ENOBUFS). * F_domain_not (with error bit) if the given domain is unknown or is unsupported. * F_file_descriptor_max (with error bit) if max file descriptors is reached. * F_file_open_max (with error bit) too many open files. @@ -269,7 +269,7 @@ extern "C" { * F_okay on success. * * F_access_denied (with error bit) on access denied. - * F_buffer_not (with error bit) if unable to create socket due to resource restrictions (maps to ENOBUFS). + * F_buffer_sufficient_not (with error bit) if unable to create socket due to resource restrictions (maps to ENOBUFS). * F_domain_not (with error bit) if the given domain is unknown or is unsupported. * F_file_descriptor_max (with error bit) if max file descriptors is reached. * F_file_open_max (with error bit) too many open files. @@ -498,7 +498,7 @@ extern "C" { * * F_file_descriptor (with error bit) if ID is an invalid descriptor. * F_buffer (with error bit) if the buffer is invalid. - * F_buffer_not (with error bit) due to resource restrictions (maps to ENOBUFS). + * F_buffer_sufficient_not (with error bit) due to resource restrictions (maps to ENOBUFS). * F_connect_not (with error bit) if the socket is not connected. * F_parameter (with error bit) if a parameter is invalid. * F_socket_not (with error bit) if the ID is not a socket descriptor. @@ -546,7 +546,6 @@ extern "C" { * F_connect_not (with error bit) if the socket is not connected. * F_connect_refuse (with error bit) if connection is refused. * F_connect_reset (with error bit) if connection is reset. - * F_block (with error bit) if socket is blocked. * F_buffer (with error bit) if the buffer is invalid. * F_file_descriptor (with error bit) if ID is an invalid descriptor. * F_interrupt (with error bit) if interrupt is received. @@ -555,6 +554,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. * F_pipe (with error bit) if the local end of a connection oriented socket is closed or SIGPIPE is received. * F_prohibited (with error bit) if the insufficient privileges to perform read. + * F_socket_block (with error bit) if socket is blocked. * F_socket_not (with error bit) if the ID is not a socket descriptor. * F_time_out (with error bit) if a timeout occurred. * @@ -596,7 +596,6 @@ extern "C" { * F_connect_not (with error bit) if the socket is not connected. * F_connect_refuse (with error bit) if connection is refused. * F_connect_reset (with error bit) if connection is reset. - * F_block (with error bit) if socket is blocked. * F_buffer (with error bit) if the buffer is invalid. * F_file_descriptor (with error bit) if ID is an invalid descriptor. * F_interrupt (with error bit) if interrupt is received. @@ -605,6 +604,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. * F_pipe (with error bit) if the local end of a connection oriented socket is closed or SIGPIPE is received. * F_prohibited (with error bit) if the insufficient privileges to perform read. + * F_socket_block (with error bit) if socket is blocked. * F_socket_not (with error bit) if the ID is not a socket descriptor. * F_time_out (with error bit) if a timeout occurred. * @@ -651,7 +651,6 @@ extern "C" { * F_connect_not (with error bit) if the socket is not connected. * F_connect_refuse (with error bit) if connection is refused. * F_connect_reset (with error bit) if connection is reset. - * F_block (with error bit) if socket is blocked. * F_buffer (with error bit) if the buffer is invalid. * F_file_descriptor (with error bit) if ID is an invalid descriptor. * F_interrupt (with error bit) if interrupt is received. @@ -660,6 +659,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. * F_pipe (with error bit) if the local end of a connection oriented socket is closed or SIGPIPE is received. * F_prohibited (with error bit) if the insufficient privileges to perform read. + * F_socket_block (with error bit) if socket is blocked. * F_socket_not (with error bit) if the ID is not a socket descriptor. * F_time_out (with error bit) if a timeout occurred. * @@ -703,13 +703,12 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_address_not (with error bit) if no address is provided and the connection is not "connection-mode". - * F_buffer_not (with error bit) if unable to send message because output buffer is full. + * F_buffer_sufficient_not (with error bit) if unable to send message because output buffer is full. * F_complete_not (with error bit) if an existing connection is not yet complete. * F_connect (with error bit) if an address is provided and the connection is "connection-mode". * F_connect_not (with error bit) if the socket is not connected. * F_connect_refuse (with error bit) if connection is refused. * F_connect_reset (with error bit) if connection is reset. - * F_block (with error bit) if socket is blocked. * F_buffer (with error bit) if the buffer is invalid. * F_file_descriptor (with error bit) if ID is an invalid descriptor. * F_interrupt (with error bit) if interrupt is received. @@ -719,6 +718,7 @@ extern "C" { * F_pipe (with error bit) if the local end of a connection oriented socket is closed or SIGPIPE is received (Linux might return this isntead if F_connect_not). * F_prohibited (with error bit) if the insufficient privileges to perform send. * F_size (with error bit) if size of message makes atomically sending message impossible on a socket type that requires this to be atomic. + * F_socket_block (with error bit) if socket is blocked. * F_socket_not (with error bit) if the ID is not a socket descriptor. * F_time_out (with error bit) if a timeout occurred. * @@ -757,13 +757,12 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_address_not (with error bit) if no address is provided and the connection is not "connection-mode". - * F_buffer_not (with error bit) if unable to send message because output buffer is full. + * F_buffer_sufficient_not (with error bit) if unable to send message because output buffer is full. * F_complete_not (with error bit) if an existing connection is not yet complete. * F_connect (with error bit) if an address is provided and the connection is "connection-mode". * F_connect_not (with error bit) if the socket is not connected. * F_connect_refuse (with error bit) if connection is refused. * F_connect_reset (with error bit) if connection is reset. - * F_block (with error bit) if socket is blocked. * F_buffer (with error bit) if the buffer is invalid. * F_file_descriptor (with error bit) if ID is an invalid descriptor. * F_interrupt (with error bit) if interrupt is received. @@ -773,6 +772,7 @@ extern "C" { * F_pipe (with error bit) if the local end of a connection oriented socket is closed or SIGPIPE is received (Linux might return this isntead if F_connect_not). * F_prohibited (with error bit) if the insufficient privileges to perform send. * F_size (with error bit) if size of message makes atomically sending message impossible on a socket type that requires this to be atomic. + * F_socket_block (with error bit) if socket is blocked. * F_socket_not (with error bit) if the ID is not a socket descriptor. * F_time_out (with error bit) if a timeout occurred. * @@ -816,13 +816,12 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_address_not (with error bit) if no address is provided and the connection is not "connection-mode". - * F_buffer_not (with error bit) if unable to send message because output buffer is full. + * F_buffer_sufficient_not (with error bit) if unable to send message because output buffer is full. * F_complete_not (with error bit) if an existing connection is not yet complete. * F_connect (with error bit) if an address is provided and the connection is "connection-mode". * F_connect_not (with error bit) if the socket is not connected. * F_connect_refuse (with error bit) if connection is refused. * F_connect_reset (with error bit) if connection is reset. - * F_block (with error bit) if socket is blocked. * F_buffer (with error bit) if the buffer is invalid. * F_file_descriptor (with error bit) if ID is an invalid descriptor. * F_interrupt (with error bit) if interrupt is received. @@ -832,6 +831,7 @@ extern "C" { * F_pipe (with error bit) if the local end of a connection oriented socket is closed or SIGPIPE is received (Linux might return this isntead if F_connect_not). * F_prohibited (with error bit) if the insufficient privileges to perform send. * F_size (with error bit) if size of message makes atomically sending message impossible on a socket type that requires this to be atomic. + * F_socket_block (with error bit) if socket is blocked. * F_socket_not (with error bit) if the ID is not a socket descriptor. * F_time_out (with error bit) if a timeout occurred. * diff --git a/level_0/f_socket/tests/unit/c/test-socket-accept.c b/level_0/f_socket/tests/unit/c/test-socket-accept.c index dd194d6..c5d19c5 100644 --- a/level_0/f_socket/tests/unit/c/test-socket-accept.c +++ b/level_0/f_socket/tests/unit/c/test-socket-accept.c @@ -39,7 +39,7 @@ void test__f_socket_accept__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_block, + F_socket_block, F_file_descriptor, F_buffer, F_network_client_not, @@ -50,7 +50,7 @@ void test__f_socket_accept__fails(void **state) { F_network_not, F_file_open_max, F_network_reach_not, - F_buffer_not, + F_buffer_sufficient_not, F_memory_not, F_network_device_not, F_option_not, @@ -61,7 +61,7 @@ void test__f_socket_accept__fails(void **state) { F_support_not, F_protocol_not, F_time_out, - F_block, + F_socket_block, F_failure, }; diff --git a/level_0/f_socket/tests/unit/c/test-socket-connect.c b/level_0/f_socket/tests/unit/c/test-socket-connect.c index bcec369..c7493aa 100644 --- a/level_0/f_socket/tests/unit/c/test-socket-connect.c +++ b/level_0/f_socket/tests/unit/c/test-socket-connect.c @@ -37,7 +37,7 @@ void test__f_socket_connect__fails(void **state) { F_busy_address, F_available_not_address, F_domain_not, - F_block, + F_socket_block, F_complete_not, F_file_descriptor, F_connect_refuse, diff --git a/level_0/f_socket/tests/unit/c/test-socket-create.c b/level_0/f_socket/tests/unit/c/test-socket-create.c index 6b55abc..ae9effa 100644 --- a/level_0/f_socket/tests/unit/c/test-socket-create.c +++ b/level_0/f_socket/tests/unit/c/test-socket-create.c @@ -28,7 +28,7 @@ void test__f_socket_create__fails(void **state) { F_parameter, F_file_descriptor_max, F_file_open_max, - F_buffer_not, + F_buffer_sufficient_not, F_memory_not, F_protocol_not, F_type_not, diff --git a/level_0/f_socket/tests/unit/c/test-socket-create_pair.c b/level_0/f_socket/tests/unit/c/test-socket-create_pair.c index 2da791e..feec7f9 100644 --- a/level_0/f_socket/tests/unit/c/test-socket-create_pair.c +++ b/level_0/f_socket/tests/unit/c/test-socket-create_pair.c @@ -28,7 +28,7 @@ void test__f_socket_create_pair__fails(void **state) { F_parameter, F_file_descriptor_max, F_file_open_max, - F_buffer_not, + F_buffer_sufficient_not, F_memory_not, F_protocol_not, F_failure, diff --git a/level_0/f_socket/tests/unit/c/test-socket-name_peer.c b/level_0/f_socket/tests/unit/c/test-socket-name_peer.c index 1cc5bb2..90d00ff 100644 --- a/level_0/f_socket/tests/unit/c/test-socket-name_peer.c +++ b/level_0/f_socket/tests/unit/c/test-socket-name_peer.c @@ -23,7 +23,7 @@ void test__f_socket_name_peer__fails(void **state) { F_file_descriptor, F_buffer, F_parameter, - F_buffer_not, + F_buffer_sufficient_not, F_connect_not, F_socket_not, F_failure, diff --git a/level_0/f_socket/tests/unit/c/test-socket-read.c b/level_0/f_socket/tests/unit/c/test-socket-read.c index 6878350..11d908b 100644 --- a/level_0/f_socket/tests/unit/c/test-socket-read.c +++ b/level_0/f_socket/tests/unit/c/test-socket-read.c @@ -35,7 +35,7 @@ void test__f_socket_read__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_block, + F_socket_block, F_complete_not, F_file_descriptor, F_connect_refuse, @@ -51,7 +51,7 @@ void test__f_socket_read__fails(void **state) { F_prohibited, F_pipe, F_time_out, - F_block, + F_socket_block, F_failure, }; diff --git a/level_0/f_socket/tests/unit/c/test-socket-read_message.c b/level_0/f_socket/tests/unit/c/test-socket-read_message.c index fd65e0f..ba856c9 100644 --- a/level_0/f_socket/tests/unit/c/test-socket-read_message.c +++ b/level_0/f_socket/tests/unit/c/test-socket-read_message.c @@ -37,7 +37,7 @@ void test__f_socket_read_message__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_block, + F_socket_block, F_complete_not, F_file_descriptor, F_connect_refuse, @@ -53,7 +53,7 @@ void test__f_socket_read_message__fails(void **state) { F_prohibited, F_pipe, F_time_out, - F_block, + F_socket_block, F_failure, }; diff --git a/level_0/f_socket/tests/unit/c/test-socket-read_stream.c b/level_0/f_socket/tests/unit/c/test-socket-read_stream.c index d2fa6d0..c856e1d 100644 --- a/level_0/f_socket/tests/unit/c/test-socket-read_stream.c +++ b/level_0/f_socket/tests/unit/c/test-socket-read_stream.c @@ -35,7 +35,7 @@ void test__f_socket_read_stream__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_block, + F_socket_block, F_complete_not, F_file_descriptor, F_connect_refuse, @@ -51,7 +51,7 @@ void test__f_socket_read_stream__fails(void **state) { F_prohibited, F_pipe, F_time_out, - F_block, + F_socket_block, F_failure, }; diff --git a/level_0/f_socket/tests/unit/c/test-socket-write.c b/level_0/f_socket/tests/unit/c/test-socket-write.c index ee791b0..488f251 100644 --- a/level_0/f_socket/tests/unit/c/test-socket-write.c +++ b/level_0/f_socket/tests/unit/c/test-socket-write.c @@ -38,7 +38,7 @@ void test__f_socket_write__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_block, + F_socket_block, F_complete_not, F_file_descriptor, F_connect_refuse, @@ -49,7 +49,7 @@ void test__f_socket_write__fails(void **state) { F_parameter, F_connect, F_size, - F_buffer_not, + F_buffer_sufficient_not, F_memory_not, F_connect_not, F_socket_not, @@ -57,7 +57,7 @@ void test__f_socket_write__fails(void **state) { F_prohibited, F_pipe, F_time_out, - F_block, + F_socket_block, F_failure, }; diff --git a/level_0/f_socket/tests/unit/c/test-socket-write_message.c b/level_0/f_socket/tests/unit/c/test-socket-write_message.c index 3056e82..4354552 100644 --- a/level_0/f_socket/tests/unit/c/test-socket-write_message.c +++ b/level_0/f_socket/tests/unit/c/test-socket-write_message.c @@ -40,7 +40,7 @@ void test__f_socket_write_message__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_block, + F_socket_block, F_complete_not, F_file_descriptor, F_connect_refuse, @@ -51,7 +51,7 @@ void test__f_socket_write_message__fails(void **state) { F_parameter, F_connect, F_size, - F_buffer_not, + F_buffer_sufficient_not, F_memory_not, F_connect_not, F_socket_not, @@ -59,7 +59,7 @@ void test__f_socket_write_message__fails(void **state) { F_prohibited, F_pipe, F_time_out, - F_block, + F_socket_block, F_failure, }; diff --git a/level_0/f_socket/tests/unit/c/test-socket-write_stream.c b/level_0/f_socket/tests/unit/c/test-socket-write_stream.c index 744c8aa..8f99f6c 100644 --- a/level_0/f_socket/tests/unit/c/test-socket-write_stream.c +++ b/level_0/f_socket/tests/unit/c/test-socket-write_stream.c @@ -38,7 +38,7 @@ void test__f_socket_write_stream__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_block, + F_socket_block, F_complete_not, F_file_descriptor, F_connect_refuse, @@ -49,7 +49,7 @@ void test__f_socket_write_stream__fails(void **state) { F_parameter, F_connect, F_size, - F_buffer_not, + F_buffer_sufficient_not, F_memory_not, F_connect_not, F_socket_not, @@ -57,7 +57,7 @@ void test__f_socket_write_stream__fails(void **state) { F_prohibited, F_pipe, F_time_out, - F_block, + F_socket_block, F_failure, }; diff --git a/level_0/f_status/c/status.h b/level_0/f_status/c/status.h index ab8e5e7..0b5f7a3 100644 --- a/level_0/f_status/c/status.h +++ b/level_0/f_status/c/status.h @@ -315,6 +315,9 @@ extern "C" { F_buffer, F_buffer_not, F_buffer_overflow, + F_buffer_restrict, + F_buffer_sufficient, + F_buffer_sufficient_not, F_buffer_too_large, F_buffer_too_small, F_buffer_underflow, @@ -337,6 +340,12 @@ extern "C" { F_character_not, F_child, F_child_not, + F_clock, + F_clock_ahead, + F_clock_behind, + F_clock_match, + F_clock_not, + F_clock_skew, F_combarudoo, F_combarudoo_not, F_complete, @@ -817,6 +826,7 @@ extern "C" { F_skip, F_skip_not, F_socket, + F_socket_block, F_socket_client, F_socket_not, F_socket_receive, diff --git a/level_0/f_status_string/c/status_string.c b/level_0/f_status_string/c/status_string.c index e075a0d..fcf0405 100644 --- a/level_0/f_status_string/c/status_string.c +++ b/level_0/f_status_string/c/status_string.c @@ -156,6 +156,9 @@ extern "C" { const f_string_static_t f_status_buffer_s = macro_f_string_static_t_initialize_1(F_status_buffer_s, 0, F_status_buffer_s_length); const f_string_static_t f_status_buffer_not_s = macro_f_string_static_t_initialize_1(F_status_buffer_not_s, 0, F_status_buffer_not_s_length); const f_string_static_t f_status_buffer_overflow_s = macro_f_string_static_t_initialize_1(F_status_buffer_overflow_s, 0, F_status_buffer_overflow_s_length); + const f_string_static_t f_status_buffer_restrict_s = macro_f_string_static_t_initialize_1(F_status_buffer_restrict_s, 0, F_status_buffer_restrict_s_length); + const f_string_static_t f_status_buffer_sufficient_s = macro_f_string_static_t_initialize_1(F_status_buffer_sufficient_s, 0, F_status_buffer_sufficient_s_length); + const f_string_static_t f_status_buffer_sufficient_not_s = macro_f_string_static_t_initialize_1(F_status_buffer_sufficient_not_s, 0, F_status_buffer_sufficient_not_s_length); const f_string_static_t f_status_buffer_too_large_s = macro_f_string_static_t_initialize_1(F_status_buffer_too_large_s, 0, F_status_buffer_too_large_s_length); const f_string_static_t f_status_buffer_too_small_s = macro_f_string_static_t_initialize_1(F_status_buffer_too_small_s, 0, F_status_buffer_too_small_s_length); const f_string_static_t f_status_buffer_underflow_s = macro_f_string_static_t_initialize_1(F_status_buffer_underflow_s, 0, F_status_buffer_underflow_s_length); @@ -178,6 +181,12 @@ extern "C" { const f_string_static_t f_status_character_not_s = macro_f_string_static_t_initialize_1(F_status_character_not_s, 0, F_status_character_not_s_length); const f_string_static_t f_status_child_s = macro_f_string_static_t_initialize_1(F_status_child_s, 0, F_status_child_s_length); const f_string_static_t f_status_child_not_s = macro_f_string_static_t_initialize_1(F_status_child_not_s, 0, F_status_child_not_s_length); + const f_string_static_t f_status_clock_s = macro_f_string_static_t_initialize_1(F_status_clock_s, 0, F_status_clock_s_length); + const f_string_static_t f_status_clock_ahead_s = macro_f_string_static_t_initialize_1(F_status_clock_ahead_s, 0, F_status_clock_ahead_s_length); + const f_string_static_t f_status_clock_behind_s = macro_f_string_static_t_initialize_1(F_status_clock_behind_s, 0, F_status_clock_behind_s_length); + const f_string_static_t f_status_clock_match_s = macro_f_string_static_t_initialize_1(F_status_clock_match_s, 0, F_status_clock_match_s_length); + const f_string_static_t f_status_clock_not_s = macro_f_string_static_t_initialize_1(F_status_clock_not_s, 0, F_status_clock_not_s_length); + const f_string_static_t f_status_clock_skew_s = macro_f_string_static_t_initialize_1(F_status_clock_skew_s, 0, F_status_clock_skew_s_length); const f_string_static_t f_status_combarudoo_s = macro_f_string_static_t_initialize_1(F_status_combarudoo_s, 0, F_status_combarudoo_s_length); const f_string_static_t f_status_combarudoo_not_s = macro_f_string_static_t_initialize_1(F_status_combarudoo_not_s, 0, F_status_combarudoo_not_s_length); const f_string_static_t f_status_complete_s = macro_f_string_static_t_initialize_1(F_status_complete_s, 0, F_status_complete_s_length); @@ -665,6 +674,7 @@ extern "C" { const f_string_static_t f_status_skip_s = macro_f_string_static_t_initialize_1(F_status_skip_s, 0, F_status_skip_s_length); const f_string_static_t f_status_skip_not_s = macro_f_string_static_t_initialize_1(F_status_skip_not_s, 0, F_status_skip_not_s_length); const f_string_static_t f_status_socket_s = macro_f_string_static_t_initialize_1(F_status_socket_s, 0, F_status_socket_s_length); + const f_string_static_t f_status_socket_block_s = macro_f_string_static_t_initialize_1(F_status_socket_block_s, 0, F_status_socket_block_s_length); const f_string_static_t f_status_socket_client_s = macro_f_string_static_t_initialize_1(F_status_socket_client_s, 0, F_status_socket_client_s_length); const f_string_static_t f_status_socket_not_s = macro_f_string_static_t_initialize_1(F_status_socket_not_s, 0, F_status_socket_not_s_length); const f_string_static_t f_status_socket_receive_s = macro_f_string_static_t_initialize_1(F_status_socket_receive_s, 0, F_status_socket_receive_s_length); @@ -1529,6 +1539,21 @@ extern "C" { break; + case F_buffer_restrict: + *name = f_status_buffer_restrict_s; + + break; + + case F_buffer_sufficient: + *name = f_status_buffer_sufficient_s; + + break; + + case F_buffer_sufficient_not: + *name = f_status_buffer_sufficient_not_s; + + break; + case F_buffer_too_large: *name = f_status_buffer_too_large_s; @@ -1639,6 +1664,36 @@ extern "C" { break; + case F_clock: + *name = f_status_clock_s; + + break; + + case F_clock_ahead: + *name = f_status_clock_ahead_s; + + break; + + case F_clock_behind: + *name = f_status_clock_behind_s; + + break; + + case F_clock_match: + *name = f_status_clock_match_s; + + break; + + case F_clock_not: + *name = f_status_clock_not_s; + + break; + + case F_clock_skew: + *name = f_status_clock_skew_s; + + break; + case F_combarudoo: *name = f_status_combarudoo_s; @@ -4040,6 +4095,11 @@ extern "C" { break; + case F_socket_block: + *name = f_status_socket_block_s; + + break; + case F_socket_client: *name = f_status_socket_client_s; diff --git a/level_0/f_status_string/c/status_string.h b/level_0/f_status_string/c/status_string.h index ab1bc51..7c0b899 100644 --- a/level_0/f_status_string/c/status_string.h +++ b/level_0/f_status_string/c/status_string.h @@ -316,6 +316,9 @@ extern "C" { #define F_status_buffer_s "F_buffer" #define F_status_buffer_not_s "F_buffer_not" #define F_status_buffer_overflow_s "F_buffer_overflow" + #define F_status_buffer_restrict_s "F_buffer_restrict" + #define F_status_buffer_sufficient_s "F_buffer_sufficient" + #define F_status_buffer_sufficient_not_s "F_buffer_sufficient_not" #define F_status_buffer_too_large_s "F_buffer_too_large" #define F_status_buffer_too_small_s "F_buffer_too_small" #define F_status_buffer_underflow_s "F_buffer_underflow" @@ -338,6 +341,12 @@ extern "C" { #define F_status_character_not_s "F_character_not" #define F_status_child_s "F_child" #define F_status_child_not_s "F_child_not" + #define F_status_clock_s "F_clock" + #define F_status_clock_ahead_s "F_clock_ahead" + #define F_status_clock_behind_s "F_clock_behind" + #define F_status_clock_match_s "F_clock_match" + #define F_status_clock_not_s "F_clock_not" + #define F_status_clock_skew_s "F_clock_skew" #define F_status_combarudoo_s "F_combarudoo" #define F_status_combarudoo_not_s "F_combarudoo_not" #define F_status_complete_s "F_complete" @@ -818,6 +827,7 @@ extern "C" { #define F_status_skip_s "F_skip" #define F_status_skip_not_s "F_skip_not" #define F_status_socket_s "F_socket" + #define F_status_socket_block_s "F_socket_block" #define F_status_socket_client_s "F_socket_client" #define F_status_socket_not_s "F_socket_not" #define F_status_socket_receive_s "F_socket_receive" @@ -998,6 +1008,9 @@ extern "C" { #define F_status_buffer_s_length 8 #define F_status_buffer_not_s_length 12 #define F_status_buffer_overflow_s_length 17 + #define F_status_buffer_restrict_s_length 17 + #define F_status_buffer_sufficient_s_length 19 + #define F_status_buffer_sufficient_not_s_length 23 #define F_status_buffer_too_large_s_length 18 #define F_status_buffer_too_small_s_length 18 #define F_status_buffer_underflow_s_length 18 @@ -1020,6 +1033,12 @@ extern "C" { #define F_status_character_not_s_length 15 #define F_status_child_s_length 7 #define F_status_child_not_s_length 11 + #define F_status_clock_s_length 7 + #define F_status_clock_ahead_s_length 13 + #define F_status_clock_behind_s_length 14 + #define F_status_clock_match_s_length 13 + #define F_status_clock_not_s_length 11 + #define F_status_clock_skew_s_length 12 #define F_status_combarudoo_s_length 12 #define F_status_combarudoo_not_s_length 16 #define F_status_complete_s_length 10 @@ -1500,6 +1519,7 @@ extern "C" { #define F_status_skip_s_length 6 #define F_status_skip_not_s_length 10 #define F_status_socket_s_length 8 + #define F_status_socket_block_s_length 14 #define F_status_socket_client_s_length 15 #define F_status_socket_not_s_length 12 #define F_status_socket_receive_s_length 16 @@ -1680,6 +1700,9 @@ extern "C" { extern const f_string_static_t f_status_buffer_s; extern const f_string_static_t f_status_buffer_not_s; extern const f_string_static_t f_status_buffer_overflow_s; + extern const f_string_static_t f_status_buffer_restrict_s; + extern const f_string_static_t f_status_buffer_sufficient_s; + extern const f_string_static_t f_status_buffer_sufficient_not_s; extern const f_string_static_t f_status_buffer_too_large_s; extern const f_string_static_t f_status_buffer_too_small_s; extern const f_string_static_t f_status_buffer_underflow_s; @@ -1702,6 +1725,12 @@ extern "C" { extern const f_string_static_t f_status_character_not_s; extern const f_string_static_t f_status_child_s; extern const f_string_static_t f_status_child_not_s; + extern const f_string_static_t f_status_clock_s; + extern const f_string_static_t f_status_clock_ahead_s; + extern const f_string_static_t f_status_clock_behind_s; + extern const f_string_static_t f_status_clock_match_s; + extern const f_string_static_t f_status_clock_not_s; + extern const f_string_static_t f_status_clock_skew_s; extern const f_string_static_t f_status_combarudoo_s; extern const f_string_static_t f_status_combarudoo_not_s; extern const f_string_static_t f_status_complete_s; @@ -2184,6 +2213,7 @@ extern "C" { extern const f_string_static_t f_status_skip_s; extern const f_string_static_t f_status_skip_not_s; extern const f_string_static_t f_status_socket_s; + extern const f_string_static_t f_status_socket_block_s; extern const f_string_static_t f_status_socket_client_s; extern const f_string_static_t f_status_socket_not_s; extern const f_string_static_t f_status_socket_receive_s; diff --git a/level_0/f_status_string/tests/unit/c/test-status_string-to.c b/level_0/f_status_string/tests/unit/c/test-status_string-to.c index 8b90a4e..34dc473 100644 --- a/level_0/f_status_string/tests/unit/c/test-status_string-to.c +++ b/level_0/f_status_string/tests/unit/c/test-status_string-to.c @@ -182,6 +182,9 @@ void test__f_status_string_to__works(void **state) { F_buffer, F_buffer_not, F_buffer_overflow, + F_buffer_restrict, + F_buffer_sufficient, + F_buffer_sufficient_not, F_buffer_too_large, F_buffer_too_small, F_buffer_underflow, @@ -204,6 +207,12 @@ void test__f_status_string_to__works(void **state) { F_character_not, F_child, F_child_not, + F_clock, + F_clock_ahead, + F_clock_behind, + F_clock_match, + F_clock_not, + F_clock_skew, F_combarudoo, F_combarudoo_not, F_complete, @@ -684,6 +693,7 @@ void test__f_status_string_to__works(void **state) { F_skip, F_skip_not, F_socket, + F_socket_block, F_socket_client, F_socket_not, F_socket_receive, @@ -933,6 +943,9 @@ void test__f_status_string_to__works(void **state) { f_status_buffer_s, f_status_buffer_not_s, f_status_buffer_overflow_s, + f_status_buffer_restrict_s, + f_status_buffer_sufficient_s, + f_status_buffer_sufficient_not_s, f_status_buffer_too_large_s, f_status_buffer_too_small_s, f_status_buffer_underflow_s, @@ -955,6 +968,12 @@ void test__f_status_string_to__works(void **state) { f_status_character_not_s, f_status_child_s, f_status_child_not_s, + f_status_clock_s, + f_status_clock_ahead_s, + f_status_clock_behind_s, + f_status_clock_match_s, + f_status_clock_not_s, + f_status_clock_skew_s, f_status_combarudoo_s, f_status_combarudoo_not_s, f_status_complete_s, @@ -1435,6 +1454,7 @@ void test__f_status_string_to__works(void **state) { f_status_skip_s, f_status_skip_not_s, f_status_socket_s, + f_status_socket_block_s, f_status_socket_client_s, f_status_socket_not_s, f_status_socket_receive_s, @@ -1531,7 +1551,7 @@ void test__f_status_string_to__works(void **state) { f_status_status_code_last_s, }; - for (uint16_t i = 0; i < 748; ++i) { + for (uint16_t i = 0; i < 758; ++i) { f_string_static_t result = f_string_static_t_initialize; diff --git a/level_1/fl_status_string/c/status_string.c b/level_1/fl_status_string/c/status_string.c index 3247905..da6d2ba 100644 --- a/level_1/fl_status_string/c/status_string.c +++ b/level_1/fl_status_string/c/status_string.c @@ -951,6 +951,24 @@ extern "C" { return F_okay; } + if (f_compare_dynamic(name, f_status_buffer_restrict_s) == F_equal_to) { + *code = F_buffer_restrict; + + return F_okay; + } + + if (f_compare_dynamic(name, f_status_buffer_sufficient_s) == F_equal_to) { + *code = F_buffer_sufficient; + + return F_okay; + } + + if (f_compare_dynamic(name, f_status_buffer_sufficient_not_s) == F_equal_to) { + *code = F_buffer_sufficient_not; + + return F_okay; + } + if (f_compare_dynamic(name, f_status_buffer_too_large_s) == F_equal_to) { *code = F_buffer_too_large; @@ -1059,38 +1077,74 @@ extern "C" { return F_okay; } + if (f_compare_dynamic(name, f_status_character_s) == F_equal_to) { + *code = F_character; + + return F_okay; + } + + if (f_compare_dynamic(name, f_status_character_not_s) == F_equal_to) { + *code = F_character_not; + + return F_okay; + } + if (f_compare_dynamic(name, f_status_child_s) == F_equal_to) { *code = F_child; return F_okay; } - if (f_compare_dynamic(name, f_status_combarudoo_s) == F_equal_to) { - *code = F_combarudoo; + if (f_compare_dynamic(name, f_status_child_not_s) == F_equal_to) { + *code = F_child_not; return F_okay; } - if (f_compare_dynamic(name, f_status_combarudoo_not_s) == F_equal_to) { - *code = F_combarudoo_not; + if (f_compare_dynamic(name, f_status_clock_s) == F_equal_to) { + *code = F_clock; return F_okay; } - if (f_compare_dynamic(name, f_status_character_s) == F_equal_to) { - *code = F_character; + if (f_compare_dynamic(name, f_status_clock_ahead_s) == F_equal_to) { + *code = F_clock_ahead; return F_okay; } - if (f_compare_dynamic(name, f_status_character_not_s) == F_equal_to) { - *code = F_character_not; + if (f_compare_dynamic(name, f_status_clock_behind_s) == F_equal_to) { + *code = F_clock_behind; return F_okay; } - if (f_compare_dynamic(name, f_status_child_not_s) == F_equal_to) { - *code = F_child_not; + if (f_compare_dynamic(name, f_status_clock_match_s) == F_equal_to) { + *code = F_clock_match; + + return F_okay; + } + + if (f_compare_dynamic(name, f_status_clock_not_s) == F_equal_to) { + *code = F_clock_not; + + return F_okay; + } + + if (f_compare_dynamic(name, f_status_clock_skew_s) == F_equal_to) { + *code = F_clock_skew; + + return F_okay; + } + + if (f_compare_dynamic(name, f_status_combarudoo_s) == F_equal_to) { + *code = F_combarudoo; + + return F_okay; + } + + if (f_compare_dynamic(name, f_status_combarudoo_not_s) == F_equal_to) { + *code = F_combarudoo_not; return F_okay; } @@ -3996,6 +4050,12 @@ extern "C" { return F_okay; } + if (f_compare_dynamic(name, f_status_socket_block_s) == F_equal_to) { + *code = F_socket_block; + + return F_okay; + } + if (f_compare_dynamic(name, f_status_socket_client_s) == F_equal_to) { *code = F_socket_client; diff --git a/level_1/fl_status_string/tests/unit/c/test-status_string-from.c b/level_1/fl_status_string/tests/unit/c/test-status_string-from.c index f41b6bd..14473b1 100644 --- a/level_1/fl_status_string/tests/unit/c/test-status_string-from.c +++ b/level_1/fl_status_string/tests/unit/c/test-status_string-from.c @@ -198,6 +198,9 @@ void test__fl_status_string_from__works(void **state) { F_buffer, F_buffer_not, F_buffer_overflow, + F_buffer_restrict, + F_buffer_sufficient, + F_buffer_sufficient_not, F_buffer_too_large, F_buffer_too_small, F_buffer_underflow, @@ -220,6 +223,12 @@ void test__fl_status_string_from__works(void **state) { F_character_not, F_child, F_child_not, + F_clock, + F_clock_ahead, + F_clock_behind, + F_clock_match, + F_clock_not, + F_clock_skew, F_combarudoo, F_combarudoo_not, F_complete, @@ -700,6 +709,7 @@ void test__fl_status_string_from__works(void **state) { F_skip, F_skip_not, F_socket, + F_socket_block, F_socket_client, F_socket_not, F_socket_receive, @@ -949,6 +959,9 @@ void test__fl_status_string_from__works(void **state) { f_status_buffer_s, f_status_buffer_not_s, f_status_buffer_overflow_s, + f_status_buffer_restrict_s, + f_status_buffer_sufficient_s, + f_status_buffer_sufficient_not_s, f_status_buffer_too_large_s, f_status_buffer_too_small_s, f_status_buffer_underflow_s, @@ -971,6 +984,12 @@ void test__fl_status_string_from__works(void **state) { f_status_character_not_s, f_status_child_s, f_status_child_not_s, + f_status_clock_s, + f_status_clock_ahead_s, + f_status_clock_behind_s, + f_status_clock_match_s, + f_status_clock_not_s, + f_status_clock_skew_s, f_status_combarudoo_s, f_status_combarudoo_not_s, f_status_complete_s, @@ -1451,6 +1470,7 @@ void test__fl_status_string_from__works(void **state) { f_status_skip_s, f_status_skip_not_s, f_status_socket_s, + f_status_socket_block_s, f_status_socket_client_s, f_status_socket_not_s, f_status_socket_receive_s, @@ -1547,7 +1567,7 @@ void test__fl_status_string_from__works(void **state) { f_status_status_code_last_s, }; - for (uint16_t i = 0; i < 748; ++i) { + for (uint16_t i = 0; i < 758; ++i) { f_status_t result = F_okay; diff --git a/level_2/fll_error/c/error/string.c b/level_2/fll_error/c/error/string.c index 3339e3b..c85fd2c 100644 --- a/level_2/fll_error/c/error/string.c +++ b/level_2/fll_error/c/error/string.c @@ -8,7 +8,7 @@ extern "C" { const f_string_t fll_error_s_a[] = { "%[%QAccess denied", "%[%QMaximum array length reached", - "%[%QMaximum buffer length reached", + "%[%QBuffer is too large", "%[%QAn error has occurred", "%[%QFile not found", "%[%QMemory problem", @@ -112,6 +112,9 @@ extern "C" { "%[%QInvalid stream", "%[%QDirectoy not found", " occurred", + "%[%QSocket is blocked", + "%[%QBuffer is restricted", + "%[%QBuffer is insufficient", }; #endif // _di_fll_error_s_a_ diff --git a/level_2/fll_error/c/error/string.h b/level_2/fll_error/c/error/string.h index b5aab02..d96d5db 100644 --- a/level_2/fll_error/c/error/string.h +++ b/level_2/fll_error/c/error/string.h @@ -39,7 +39,7 @@ extern "C" { enum { fll_error_s_000_access_denied_e, fll_error_s_001_max_arr_length_e, - fll_error_s_002_max_buf_length_e, + fll_error_s_002_buffer_too_large_e, fll_error_s_003_error_occurred_e, fll_error_s_004_file_not_found_e, fll_error_s_005_memory_problem_e, @@ -143,6 +143,10 @@ extern "C" { fll_error_s_103_invalid_stream_e, fll_error_s_104_directory_not_found_e, fll_error_s_105_occurred_e, + fll_error_s_106_blocked_socket_e, + fll_error_s_107_buffer_too_small_e, + fll_error_s_108_buffer_restrict_e, + fll_error_s_109_buffer_insufficient_e, }; // enum #endif // _di_fll_error_s_e_ diff --git a/level_2/fll_error/c/private-error.c b/level_2/fll_error/c/private-error.c index 797d913..501eb13 100644 --- a/level_2/fll_error/c/private-error.c +++ b/level_2/fll_error/c/private-error.c @@ -82,8 +82,20 @@ extern "C" { return private_fll_error_print_simple(print, debug, macro_fll_error_s(078_available_not_available)); } + if (status == F_buffer_restrict) { + return private_fll_error_print_simple(print, debug, macro_fll_error_s(108_buffer_restrict)); + } + + if (status == F_buffer_sufficient_not) { + return private_fll_error_print_simple(print, debug, macro_fll_error_s(109_buffer_insufficient)); + } + if (status == F_buffer_too_large) { - return private_fll_error_print_simple(print, debug, macro_fll_error_s(002_max_buf_length)); + return private_fll_error_print_simple(print, debug, macro_fll_error_s(002_buffer_too_large)); + } + + if (status == F_buffer_too_small) { + return private_fll_error_print_simple(print, debug, macro_fll_error_s(107_buffer_too_small)); } if (status == F_busy_address) { @@ -194,6 +206,10 @@ extern "C" { return private_fll_error_print_simple(print, debug, macro_fll_error_s(093_out_of_space)); } + if (status == F_socket_block) { + return private_fll_error_print_simple(print, debug, macro_fll_error_s(106_blocked_socket)); + } + if (status == F_socket_not) { return private_fll_error_print_simple(print, debug, macro_fll_error_s(087_invalid_socket)); }