From af6e9fefd68ec239fc56234737ad7919e0f3edcc Mon Sep 17 00:00:00 2001 From: ov075wu Date: Tue, 4 Nov 2025 19:05:29 +0100 Subject: [PATCH] refresh --- du4/a_train.c | 42 ++++++++++++++++++++++-------------------- du4/train.exe | Bin 43626 -> 43626 bytes 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/du4/a_train.c b/du4/a_train.c index 0f56a62..6d5e579 100644 --- a/du4/a_train.c +++ b/du4/a_train.c @@ -58,30 +58,32 @@ void cancel_train (struct car* first) { } struct car* clear_train(struct car* first, const char* target) { - if (first == NULL) { - return NULL; - } + struct car* current = first; + struct car* previous = NULL; - struct car* current = first; // текущий вагон - struct car* previous = NULL; // предыдущий вагон + while (current != NULL) { + if (strcmp(current->value, target) == 0) { + struct car* to_delete = current; - while (current !=NULL) { - if (strcmp(current->value, target)==0) { - if (previous==NULL) { - struct car* new_start = current->next; //Сохраняем адрес второго вагона - free(current); - current = new_start; //Двигаем курсор на следующий вагон - first = new_start; //Обновляем начало поезда - continue; + + if (previous == NULL) { + first = current->next; + current = first; + } + else { + previous->next = current->next; + current = previous->next; } - } else { - previous->next = current->next; - free(current); - current = previous->next; - continue; + + free(to_delete); + } + else { + previous = current; + current = current->next; } } - previous = current; - current = current->next; + + return first; } + diff --git a/du4/train.exe b/du4/train.exe index 7b8c3a6c89172d3e6b998b611327a42db9280d01..719eff326cff8efc8a2526bc8e20a998444c0baa 100644 GIT binary patch delta 2377 zcmZ8j3v5$m6#mcc?b^LJs6b%xXY7pGlY-1qpLJEsNoNA(ALRKr?&bL$_1Z^0b_G1H zQPy~Z!qhPfoWq*f2NU{3Brf^!1csA?=}I_pG+5UTN~eiw4o%G!#WRu-m>WY|W1cCU zm%?ZE2({&-cdm5nrmE7Kr*r)MDEyZw{NpJ6>nJ>0=e;QWbfvX9Vz4J15KTjTI-j0K z(|OxG@s_Iozo1VD3l=1re&qa|DE<$m70!J$lpAVFH2uT5LWFBD1^S76oVU#PiGQ_! zwY)4oP6Ln1&m>&|i@Vs$JY%Z!o|X&F1oe*H!S`Wk9Hn(->7@1f->T~Q%=py6tP8_} zcc9G%zB^jnvMWWOnKpPhvx^F}#t&6hgZ*=-Vr!9JxbXq*D4Giyc&5k!YjJXM34DoF z#WpbE?&7I*d7LO-0~gU;QbBf&B@a^cP>BU{@p4HPI5E+>fn;4)Ud%bG1NP&T(k$XU zTzWrD$5&|#;Gxo|v?E`s>L{ib8Zf=gO69C5vyo?CSp~T9k20HZ;|$KWWl~C&EejT6 zi|zg?o4!?5+PjR|l2RUzOA<@tLw)&yCJN8k7Q;f>JnyGiokDBSn{Jg;%m0Fo+!$G` zOb}p5PF`*vzjG=+}|?~O8jJ# zBq(wGg@5Q>^MPT7OETvsFb1?L0;{gBexBr*JA&jm>oz)hkJ#;c&a6am4!uZr?!<6z znAwZ>ZXUBJ5u7vM=1jUUxT zC_>v^IMk}gYp=)QMfY61w&l3M4CwYq_|@wUb8lu?f}1&L3;U%o5*DpTi^m}-QfNXX z-0yj|xt?z0@gkcjFPARm8zcq+3zT&GJ>gous$Dg-Jkb=5)365YEjhC>Z-DT*FDD&Kp zsL)FMseR0l64B(2FHtNPfA{Cp!IC=iL621(zrt~}bxO3y)^u`YH+?tasm|x<5ND$# zT%U=Ha6b5P7fOb}1e^JK#xCJEDAA_<3mt|96QcVmnt_jXIlzkByYi=B*u3;%*Kc%otGf9CW3Hfq+ioke5E@d7T~+x670k?-F{{!1J=c51s delta 2358 zcmZ8je^69a6u$TETlN79F0(d5K;ph#MG3?Lx0D|b)^#ll@mES>U_xqA5-w%h2D&oi zx*!V&MG+EGry9o*dO4{LrD74|AE`rQlTGTRGpkUu6_pL;>)eH1pgXg7-}}yYzH`pK z=ic4>{oMV2&a;O*o!PKAPjyiy4L6R{WAaWabJPdv{0e#)_VROS30&Z#>0R9TA7WK2S!sCQE2YIh9l#mWVl8B2pdi7DreF+q` zVbNCf?no#{e1Va7TT+?1Xd;%+u*HaZU&qP)h?c47yj_u~e8=aV8HScZ*c1}0yQCt- z)#IIsG*_I_dls5PEc6ffE@T_M1WPs1DehVRY>t*;z+Mcf&qpa_j^KjpD+bOS1>b~b z%^dn1^l4&gBHY!K=Ut!ackk=*cviaZItLT6?v1SOhlv=`>T^1Lq%sP@5|r?sMbK>( z2G+W*KGYS~Bh$T7>sn#tSw%0yQK67#HipicYw$CN+)_!+dAk<;5jJ#mJ zyz#NW82O=TOuP-r{^e$EA=|>kRCK<)EbH6D2f)!#51A z5Q&g>IVx?K<4C+5X>Q~v9cIj&NTG(yjZkyVaB9AZZi8>Np)?~qrtGYu z;OQhJFH%<+$&&||GT%xz`U%A6Bq8USoZ0j#cpK*j@KMeh^*@&tWeB1&^bnUTVLEGbEf}*ScM0{t zuelaZdkyAV4Cqo|Nuq^NW0@UadreWWDG9Me>XwE@@;Tunb$KW*6kN3|r-iam21ZZE)(xK& zs#djTNw^a#`fOl;wgRbpA<7IMWhlq2} zj_X{p2HJNRXfb^8j>wU4_QJjd$3m)uB@WRfX$heufpDa#sOU8mB%UCWVlUlh#}akW z?AUA~5dkJE`wa}|2_gYzC(L+v*i7)!9MNRVR>quwbR&{FDZmN%wnIUcO|QdSd&D<@ zUjeylnBIa@)z{TpJz9a*O@S-50{pTo41TDd2fyq*!|C+?LUnL?m(A2^2#Bx*Y}mx@ zVgL!qR)g7z7URg07~z=n)v9W|ddCvqfqoL+@?%IXBAyAzdx+ecfOIi0?D#RSi-?p5 zkwAQc7cZ^@QPJBxA&;^|<+|M}fmTC9t*G9Xg67dm4 zNKtvEef`FD6^mf`zH~eWu6^mIRHj7O4zqC%`K^A0uswgJqO=szYWQiNNE1L)FVgdn zgtHHp)I0Q@L1pIq875i`H|vM>2|-O3aVy#+_}P<=M@wu-r_oT*aF2csmPQe~Y(pbM z+VD9ME;Me&W1I{kCnUo%SV-I95QzE*6T&PM2=T!;AY$A84mSPj3D#q1O@-&1Y&0MC zH>FR%GQq0Be*lZdlCy6q+wxXv1xW^9Q<~lrteaJ1Kd! zda?)p-EYHFZ#}@~x&scn5yG2oro>=KJTZP|c@SaBfIpqB@K$p=T@5FjMfxFJZSKIU zWa~i(C#1k{2S26<;rJmDo4W5%JuXo}OFH#JeG4AZ6!@ei4NJS%;-C-Y4Tn{e{sZ#D B)sX-I