From e2f5b8624d11857c7dc3494238e707d88bf84f23 Mon Sep 17 00:00:00 2001 From: Epochryphon Date: Tue, 21 Jul 2026 13:32:06 -0500 Subject: [PATCH] fixed some style issues. --- liblog.a | Bin 0 -> 5384 bytes makefile | 18 ++++++++++++++++++ source_code/{new_log.c => log.c} | 26 +++++++++++++++----------- source_code/{new_log.h => log.h} | 5 +++-- source_code/log.o | Bin 0 -> 5120 bytes 5 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 liblog.a create mode 100644 makefile rename source_code/{new_log.c => log.c} (93%) rename source_code/{new_log.h => log.h} (97%) create mode 100644 source_code/log.o diff --git a/liblog.a b/liblog.a new file mode 100644 index 0000000000000000000000000000000000000000..636c72270e31722465e936ba70e0bb04b4509e90 GIT binary patch literal 5384 zcmcgwUu>IK6~A$^CQIATX6uAuKtA9zBr5UjEGf zoxc3ad@7%PG@DPA?Be3`JOfb5+Nu0X=FGMNi!JSu@?zE&T6%6Sl}YFGvuSAzAh(#$ zrV1;I%XYRXtSBUSctsn?PGdOO-!F1M5bcvDr#qh>vIw{cD=n?g4Za4U^pYH?Q2B;nic^bG+IX>L!po35!ST-1#eaK6sY^MkXCR zGkJ(R*MFaA>tNN9fvY~?)yE^r>bK2tUb_Q!$!goC3?Hq#p4G`9thn=z@Q`3B@){OI zYL7=;!MVw+)b$+S?FKM@#lDL zPfVpzYkP}3t3mD*OlQ11THna2j6^=}bR*u7iub!F@%Ey&iTxnw;@e64QB{5@;dWs?0pm#kk2{;X9O z{1?`y;4fI$1b^B3Q1D+{C?o{QzT+dLgxQX(r7@B|Wb&nEs0KWWTeG-hE-<7h^q@Aih4dP8$&h!2I14233HsAPtE z5719(C^R=@vaN=xiTKDUON&rXpd~5;BE9_jj$8Oj!rW=1M9%3SOx8qyydY8 z*0LICxpz-{$2wI_KjB}HZNCK{H3AoXM~q;lb<8MajMY=d`4%5H3R9g%Fm43mMn`-% znW3*K*c09DGJ!2fS;x*v41OT^t_z8=J(2@^LCRwq_KK8`N`8_!E=tggIOq=>fuH(@ zjo{O*!-iRF8#cNx-H|XN7k9;tflB+Ban0BIgO*NXAZ|qBMmO1z?XVFTHaZf!eHV>) zeG|rqKHqT?;$$o0Hv6HeqB;J1qgh*P^P7(59xHG=wTe}`6~_a>r^OL#K^QK?7Pf24 zI3lI53Vb_$P%Sj!t(v`Z91?;!Clw_4gA%{%7L>7s#J}RfA0i!V<)sM%n&GE+z*ly_ z%RAtxp=R-Ggx^IoR3{Enb@x2Uz^?%$Qus?G1IIs*s>$Dw3>^0hNY&+=Bm*}ku4?no z5-&(x)#rN>uS;CiC}BtFYnJ~%cfe6-&FsY^EyKk7EwlBi(;kNBtjg#x)fdkNCe!VPvOr1Bm(ZIPvJiYNCX_~sc_UA2>55{Q}`bN5_$9d zn+ppZTOEF&_g%Jyt2n!4{UHwQRXu;!gR2_*x(8SH#dkcoivL3ouI#UPaAp4>5+PFg zsQe%E;L85T9vpKDdd7pRaXs(BRX%sia}mw@ymfhS)$gRlk>BU&Q~0cge_q4SYH{w> z@Ly^;&KMQv4_X|(K5uCDdVQ*eM*ezzw#x|w)9cgJaJ@e7({Q~$2Q^%;&oK?x=i#`9 z>+_J+aJ`->JwYf7nCy4et^KR;sKix0D*T%g4@$1^LsBlgVPlu=vfc0?vpDXT-_(HdT@20Y( zBrjmo5M7b`3ws6qV2^=RU44yY;L;3Df?o9Wt8ls8N@d?52{FC?b?L9a&){U@M3bS&=cT_1MI)8Jf*cYM)9Zg(`r|Kb zoxJ{Q)YxqPuE_bTOJ~#{?gQno>aSVfaCu8^h|4lDgu}hz^~W2?yY>XJ1vC(;_kgRp XV^uOZ&g`cC^5XrOZcMUgI@o^!Ag+c` literal 0 HcmV?d00001 diff --git a/makefile b/makefile new file mode 100644 index 0000000..03bbd84 --- /dev/null +++ b/makefile @@ -0,0 +1,18 @@ +.POSIX: + +# Compiler and archiver definitions +CC = cc +AR = ar +CFLAGS = -O2 -I./source_code + +# Targets +all: liblog.a + +source_code/log.o: source_code/log.c source_code/log.h + $(CC) $(CFLAGS) -c source_code/log.c -o source_code/log.o + +liblog.a: source_code/log.o + $(AR) -rc liblog.a source_code/log.o + +clean: + rm -f source_code/log.o liblog.a diff --git a/source_code/new_log.c b/source_code/log.c similarity index 93% rename from source_code/new_log.c rename to source_code/log.c index 233c03b..13a97bf 100644 --- a/source_code/new_log.c +++ b/source_code/log.c @@ -22,6 +22,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. * + * Original version can be found at: https://github.com/rxi/log.c * * Modified work Copyright (c) 2026 Emilia Marigold (AGPLv3) * @@ -33,12 +34,13 @@ * See the LICENSE file for the full AGPLv3 terms and conditions. ***/ -#include "new_log.h" +#include "log.h" #define MAX_CALLBACKS 32 typedef -struct callback_struct +struct +callback_struct { log_function function; void *user_data; @@ -46,7 +48,8 @@ struct callback_struct } callback_type; -static struct static_log_data_struct +static struct +static_log_data_struct { void *user_data; lock_function lock; @@ -62,7 +65,7 @@ level_strings[] = "TRACE", "DEBUG", "INFO", - "WARNING", + "WARN", "ERROR", "FATAL" }; @@ -84,10 +87,11 @@ static void stdout_callback(log_event_type *event) { char buffer[16]; + buffer[strftime(buffer, - sizeof(buffer), - "%H:%M:%S", - event->local_time)] = '\0'; + sizeof(buffer), + "%H:%M:%S", + event->local_time)] = '\0'; #ifdef LOG_USE_COLOR fprintf(event->user_data, @@ -122,9 +126,9 @@ file_callback(log_event_type *event) { char buffer[64]; buffer[strftime(buffer, - sizeof(buffer), - "%Y-%m-%d %H:%M:%S", - event->local_time)] = '\0'; + sizeof(buffer), + "%Y-%m-%d %H:%M:%S", + event->local_time)] = '\0'; fprintf(event->user_data, "%s %-5s %s:%d: ", @@ -275,7 +279,7 @@ log_log(int severity_level, for (int i = 0; i < MAX_CALLBACKS && static_log_data_struct.callbacks[i].function; - i++) + i++) { callback_type *callback_pointer = &static_log_data_struct.callbacks[i]; if (severity_level >= callback_pointer->severity_level) diff --git a/source_code/new_log.h b/source_code/log.h similarity index 97% rename from source_code/new_log.h rename to source_code/log.h index 1f1c9d0..1c47a27 100644 --- a/source_code/new_log.h +++ b/source_code/log.h @@ -16,10 +16,11 @@ #include #include -#define LOG_VERSION "r:2.26.180.1" +#define LOG_VERSION "2.26.180a" typedef -struct log_event_struct +struct +log_event_struct { va_list argument_pointer; const char *format; diff --git a/source_code/log.o b/source_code/log.o new file mode 100644 index 0000000000000000000000000000000000000000..85893119a7d9bf9663aa662a07482614c6bec4d7 GIT binary patch literal 5120 zcmb`KUu;`f9mkKItjYT4+H9RL49FE+gQF5-cO4|rV7`gdoC&wh@}~`~#d93H33U?B zz8>jTwoXnvu3V2y>|sJ^>cbv7Z4x}}VMtr&EfX7vhrCQ;PxJ+`s@)%ikS3Tgzwf!{ zq-QrS5)wb<`ghLf{C>alyXXGSxi^oGWex@d0j4CtzQ=C#6eS(L(N2kGicpCCJ@l1- z&hX|PK$kHv#od4L`t@1fI1-!ZjqYfSAa~OiPqw)G7w&%aJ^@B1y*xj44|lKrF5TVB z8l!`kgW!!v6Pd>M%?aMT1$LQ6_ofV=YSNyw1#XL)mXN~O{4euulO z5$={vcOsT-Z4^~TA|G$L5pP(CX0QVK=$UDeS80mPJ@`fA%r^s6As( z+wP|`Q~ZhRF)DzJyJoFZ(i!)H^(^VNmXiwguUQwV9qPYe{YL0#td`KfvNnZ&-nt_6 zOV-CizigqHLjA8=VbY%|hXqQ%As%rt^ij*5ws@#NZJGE<@VC=eiUQD*XRH`^9V?M` z=dBC|!~9&!F?d5fi`OYCYj2(v>&p==EOlj^^#%-g3BfOcm%9L8z zq_Cv-CP-t%Y`;q}YcJtBdiR7RcgZA^?e-?BaAB(oL+APt|B1J-(hr=lkJ~5gAK6*d zL9*=?E+yTI(7m#b)7IeCJk^SqC~t^c3$48&GB|Ffcq3yCZe`v)ZcT`kFNa}(yt(^l zxsN*Dfj3Ql+RBKX>Apw1a+Xon6JnFy*p3-m5A4at8Ja>BqUYV1rW8D$u}pn)I@W}~ zJIPge%>MA|F)GpjcF%ou&%&1Oqmx8`Fc4iDh|Zf)J{&zX9Gzm(su>-)n|`Xp(fMJM zZ4FFM+M{DEJvK5k&h9&W@CZ9*PabAtlaog#*+HuQOsDw&GaDZr9X4Y#bG2osW+v~7 z-xW^`e7h#P`ybnXAf7l7Pxi|J3f@f@o)LD!_~98wXJ8AAidD#7sRNHpvcPIMaOdux z-gT;)1H`{1$6kXTGs5SChm1(QYuqU3jnxyz*+7sR<>{S9#5TgV(QEG_Gt4y&dy?Bd zCD?*&>+FnV@Poj2U9=e6Ej8HlvOTV`S7iIJ)W=ExQMO;eL4VK)|2#NiM4svzG0bN7 zh!MMROWH`B-(eer^`3F#O0et4ft|*nZ6s_XMmA(SVuVMG-t?~EdE@=yr15buc$6A8 z*~-Y<6)hF5@!#6pN3g~i-7a0?sdVDvy!y;Q5A}jt9PuoO;e{ArJGN{Svh_8=@q|5z zs0U5mF3nzz4~xe3dGD3{Hf1PvTJo>@_?f;A(OFz7uxz$iCP$~3%`cpy-otvgSgtuVTd`EDF3=c- z&Yyx^wwPNiA(yN^w*b|GLvtf58WkO6x7B;7wpegPFE>B0-2xc{h#M=fP(Fo3oOaJcD3o;2A28a{~f<_$q!9kOUmxeTpvwk{}Mg zx)iSil7Jg@DgHDd33!Mu#eWG%0*>dYIO+`o{yDl7{{tY2KhM8 ztNVJ+$5lSJ%X1OK`nvV`xSDrLa^&{~x)h(&_!l*PT8ne1#(%AGoG~iS@3lC3eO}Y- z_4-r~8u{z>*&`PaO0Q2-<9dC5OXGTd4ryGk&vA|G>u^-#`Z^ReuGcfACj?~ylYL%y zYyT>qlw8%L;@^=xBDLc8$iC_0w(Q4zT%Fs>9_uMfMp({Dd&OI_U-I!QvVYdc=@lX5 z86Q{glS@9X-Y2j6xO$&#`nYmBsTbOG|}ia$R0=3UT^`91w@S?4Mk&#mkkIa-rg!mN5zo z*m=py|c;idQ3!Cy3Ta@)ByW8H4*n2QZDFdm?*fb=U0KfWJyQS&Q3MuTYk z=QrgiUqW}Lw(0AqsNZS*A~-}y);%T88ayNa`eFZIe*ZiZa{jpVS4!orbWZxKait%V z{;IFE@>BhXsL?~0zNayER{ERhXrl60$fX8i`u#6TfBc87i{F2Z20N|aCAoer>5Tfr z`#|}t`s*||T;7oz;-X9p;qcz@`{NtP|Lh5|1q_g=?*Xsp-K%Ot HTMqUgKnz5) literal 0 HcmV?d00001