diff options
author | sergey <sergey@yandex-team.ru> | 2022-02-10 16:47:29 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:29 +0300 |
commit | 5d8d1af4df7f9cd4acc021f069546c30677e7979 (patch) | |
tree | 07a39da188e8b418699f992f22d829a37a1411b2 /util/system | |
parent | 32b231c8474a1ade4bdf776ade6a20341691d9d7 (diff) | |
download | ydb-5d8d1af4df7f9cd4acc021f069546c30677e7979.tar.gz |
Restoring authorship annotation for <sergey@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'util/system')
-rw-r--r-- | util/system/condvar.cpp | 2 | ||||
-rw-r--r-- | util/system/defaults.h | 8 | ||||
-rw-r--r-- | util/system/mktemp.cpp | 2 | ||||
-rw-r--r-- | util/system/mktemp_system.cpp | 112 | ||||
-rw-r--r-- | util/system/tls.cpp | 4 | ||||
-rw-r--r-- | util/system/tls.h | 4 |
6 files changed, 66 insertions, 66 deletions
diff --git a/util/system/condvar.cpp b/util/system/condvar.cpp index 62f3d22356..e765b4d86d 100644 --- a/util/system/condvar.cpp +++ b/util/system/condvar.cpp @@ -4,7 +4,7 @@ #include "condvar.h" #include "datetime.h" #include "spinlock.h" - + #include <util/generic/ylimits.h> #include <util/generic/intrlist.h> #include <util/generic/yexception.h> diff --git a/util/system/defaults.h b/util/system/defaults.h index dcd7abea38..df8eab29bf 100644 --- a/util/system/defaults.h +++ b/util/system/defaults.h @@ -2,14 +2,14 @@ #include "platform.h" -#if defined _unix_ +#if defined _unix_ #define LOCSLASH_C '/' #define LOCSLASH_S "/" -#else +#else #define LOCSLASH_C '\\' #define LOCSLASH_S "\\" -#endif // _unix_ - +#endif // _unix_ + #if defined(__INTEL_COMPILER) && defined(__cplusplus) #include <new> #endif diff --git a/util/system/mktemp.cpp b/util/system/mktemp.cpp index 505b7b4a4b..f0c1db8885 100644 --- a/util/system/mktemp.cpp +++ b/util/system/mktemp.cpp @@ -14,7 +14,7 @@ #include <unistd.h> #include <stdlib.h> #endif - + extern "C" int mkstemps(char* path, int slen); TString MakeTempName(const char* wrkDir, const char* prefix, const char* extension) { diff --git a/util/system/mktemp_system.cpp b/util/system/mktemp_system.cpp index 32bea2987c..990729f357 100644 --- a/util/system/mktemp_system.cpp +++ b/util/system/mktemp_system.cpp @@ -1,46 +1,46 @@ -/* - * Copyright (c) 1987, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - +/* + * Copyright (c) 1987, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + #include "defaults.h" -#include <sys/types.h> -#include <fcntl.h> -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <ctype.h> - +#include <sys/types.h> +#include <fcntl.h> +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <ctype.h> + #ifdef _win32_ #include "winint.h" #include <util/folder/dirut.h> @@ -50,13 +50,13 @@ #include <util/random/random.h> #include "sysstat.h" - -static const unsigned char padchar[] = + +static const unsigned char padchar[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - -static int + +static int GetTemp(char* path, int* doopen, int domkdir, int slen) -{ +{ char *start, *trv, *suffp; char* pad; #ifndef _win32_ @@ -64,12 +64,12 @@ GetTemp(char* path, int* doopen, int domkdir, int slen) int rval; #endif ui32 rand; - + if (doopen != nullptr && domkdir) { errno = EINVAL; return (0); } - + for (trv = path; *trv != '\0'; ++trv) { ; } @@ -80,17 +80,17 @@ GetTemp(char* path, int* doopen, int domkdir, int slen) errno = EINVAL; return (0); } - + /* Fill space with random characters */ while (trv >= path && *trv == 'X') { rand = (RandomNumber<ui32>()) % (sizeof(padchar) - 1); *trv-- = padchar[rand]; } start = trv + 1; - + /* - * check the target directory. - */ + * check the target directory. + */ if (doopen != nullptr || domkdir) { for (; trv > path; --trv) { if (*trv == '/') { @@ -117,9 +117,9 @@ GetTemp(char* path, int* doopen, int domkdir, int slen) #endif break; } - } + } } - + for (;;) { if (doopen) { if ((*doopen = @@ -157,10 +157,10 @@ GetTemp(char* path, int* doopen, int domkdir, int slen) *trv++ = *pad; break; } - } + } } /*NOTREACHED*/ -} +} extern "C" int mkstemps(char* path, int slen) { int fd; diff --git a/util/system/tls.cpp b/util/system/tls.cpp index c2f1a04a14..afd5d4bc94 100644 --- a/util/system/tls.cpp +++ b/util/system/tls.cpp @@ -241,8 +241,8 @@ private: TKey::TKey(TDtor dtor) : Impl_(new TImpl(dtor)) { -} - +} + TKey::TKey(TKey&&) noexcept = default; TKey::~TKey() = default; diff --git a/util/system/tls.h b/util/system/tls.h index 3c4f56dbeb..99902b18d1 100644 --- a/util/system/tls.h +++ b/util/system/tls.h @@ -155,7 +155,7 @@ namespace NTls { using TDtor = void (*)(void*); class TKey { - public: + public: TKey(TDtor dtor); TKey(TKey&&) noexcept; ~TKey(); @@ -168,7 +168,7 @@ namespace NTls { private: class TImpl; THolder<TImpl> Impl_; - }; + }; struct TCleaner { inline ~TCleaner() { |