message
stringlengths 6
474
| diff
stringlengths 8
5.22k
|
|---|---|
FIX: Fix error in centos 7 when format "%llu" with uint64_t.
|
@@ -9596,7 +9596,7 @@ static void process_prefixscan_command(conn *c, token_t *tokens, const size_t nt
ret = ENGINE_ENOMEM; break;
}
sprintf(attrptr, " %llu %llu %04d%02d%02d%02d%02d%02d\r\n",
- pinfo.total_item_count, pinfo.total_item_bytes,
+ (unsigned long long)pinfo.total_item_count, (unsigned long long)pinfo.total_item_bytes,
pinfo.create_time.tm_year+1900, pinfo.create_time.tm_mon+1, pinfo.create_time.tm_mday,
pinfo.create_time.tm_hour, pinfo.create_time.tm_min, pinfo.create_time.tm_sec);
if (add_iov(c, pinfo.name, pinfo.name_length) != 0 ||
|
boten: config volume +/- GPIOs mode
Config volume +/- GPIOs as GPIO_INT_BOTH and GPIO_PULL_UP.
BRANCH=none
TEST=make buildall -j
|
@@ -35,8 +35,8 @@ GPIO_INT(USB_C0_CCSBU_OVP_ODL, PIN(K, 6), GPIO_INT_FALLING | GPIO_PULL_UP, c0_cc
/* Other interrupts */
GPIO_INT(LID_OPEN, PIN(F, 3), GPIO_INT_BOTH, lid_interrupt)
GPIO_INT(LID_360_L, PIN(A, 7), GPIO_INT_BOTH, gmr_tablet_switch_isr)
-GPIO_INT(VOLDN_BTN_ODL, PIN(I, 6), GPIO_INT_BOTH, button_interrupt)
-GPIO_INT(VOLUP_BTN_ODL, PIN(I, 7), GPIO_INT_BOTH, button_interrupt)
+GPIO_INT(VOLDN_BTN_ODL, PIN(I, 6), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt)
+GPIO_INT(VOLUP_BTN_ODL, PIN(I, 7), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt)
GPIO_INT(BASE_SIXAXIS_INT_L, PIN(J, 0), GPIO_INT_FALLING | GPIO_SEL_1P8V, lsm6dsm_interrupt)
GPIO_INT(EC_WP_OD, PIN(A, 6), GPIO_INT_BOTH, switch_interrupt)
|
Added two more bruteforced NIDs
|
@@ -1121,7 +1121,9 @@ modules:
nid: 0x9FED47AC
functions:
ksceDisplayCaptureFrameBufDMAC: 0xF116D0B4
+ ksceDisplayCaptureFrameBufDMACInternal: 0x707EEE2E
ksceDisplayCaptureFrameBufIFTU: 0xB0CED8BC
+ ksceDisplayCaptureFrameBufIFTUInternal: 0xD4C812E5
ksceDisplayDisableHead: 0x43347565
ksceDisplayEnableHead: 0x496032D6
ksceDisplayGetActualViewportConf: 0x40ACFE51
|
parser: Reorganize get_gc_flags_for so it makes more sense.
|
@@ -4572,20 +4572,17 @@ static int get_gc_flags_for(lily_class *top_class, lily_type *target)
{
int result_flag = 0;
- if (target->cls->flags & CLS_GC_TAGGED)
+ if (target->cls->flags & (CLS_GC_TAGGED | CLS_VISITED))
result_flag = CLS_GC_TAGGED;
- else if (target->cls->flags & CLS_GC_SPECULATIVE)
- result_flag = CLS_GC_SPECULATIVE;
- else if (target->cls->flags & CLS_VISITED)
- result_flag = CLS_GC_TAGGED;
- else if (target->cls == top_class)
- /* A class that can hold itself definitely needs a gc tag. */
- result_flag = CLS_GC_TAGGED;
- else if (target->subtype_count) {
+ else {
+ result_flag = target->cls->flags & (CLS_GC_TAGGED | CLS_GC_SPECULATIVE);
+
+ if (target->subtype_count) {
int i;
for (i = 0;i < target->subtype_count;i++)
result_flag |= get_gc_flags_for(top_class, target->subtypes[i]);
}
+ }
return result_flag;
}
|
Implement one-shot MAC functions
Implement one-shot MAC APIs, psa_mac_compute and psa_mac_verify, introduced in PSA Crypto API 1.0.
|
@@ -2444,7 +2444,68 @@ cleanup:
return( status == PSA_SUCCESS ? abort_status : status );
}
+psa_status_t psa_mac_compute( mbedtls_svc_key_id_t key,
+ psa_algorithm_t alg,
+ const uint8_t *input,
+ size_t input_length,
+ uint8_t *mac,
+ size_t mac_size,
+ size_t *mac_length)
+{
+ psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
+ psa_mac_operation_t operation = PSA_MAC_OPERATION_INIT;
+
+ status = psa_mac_sign_setup( &operation, key, alg );
+ if( status != PSA_SUCCESS )
+ goto exit;
+
+ status = psa_mac_update( &operation, input, input_length );
+ if( status != PSA_SUCCESS )
+ goto exit;
+
+ status = psa_mac_sign_finish( &operation, mac, mac_size, mac_length );
+ if( status != PSA_SUCCESS )
+ goto exit;
+
+exit:
+ if ( status == PSA_SUCCESS )
+ status = psa_mac_abort( &operation );
+ else
+ psa_mac_abort( &operation );
+
+ return ( status );
+}
+psa_status_t psa_mac_verify( mbedtls_svc_key_id_t key,
+ psa_algorithm_t alg,
+ const uint8_t *input,
+ size_t input_length,
+ const uint8_t *mac,
+ size_t mac_length)
+{
+ psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
+ psa_mac_operation_t operation = PSA_MAC_OPERATION_INIT;
+
+ status = psa_mac_verify_setup( &operation, key, alg );
+ if( status != PSA_SUCCESS )
+ goto exit;
+
+ status = psa_mac_update( &operation, input, input_length );
+ if( status != PSA_SUCCESS )
+ goto exit;
+
+ status = psa_mac_verify_finish( &operation, mac, mac_length );
+ if( status != PSA_SUCCESS )
+ goto exit;
+
+exit:
+ if ( status == PSA_SUCCESS )
+ status = psa_mac_abort( &operation );
+ else
+ psa_mac_abort( &operation );
+
+ return ( status );
+}
/****************************************************************/
/* Asymmetric cryptography */
|
filter_record_modifier: cast -1 in string for loop condition test
|
@@ -269,7 +269,7 @@ static int cb_modifier_filter(void *data, size_t bytes,
msgpack_pack_map(&tmp_pck, removed_map_num);
kv = obj->via.map.ptr;
- for(i=0; bool_map[i] >= 0; i++) {
+ for(i=0; bool_map[i] != (char)-1; i++) {
if (bool_map[i]) {
ret = msgpack_pack_object(&tmp_pck, (kv+i)->key);
ret = msgpack_pack_object(&tmp_pck, (kv+i)->val);
|
BugID:17920924:add posix timer testcase 2
|
@@ -34,7 +34,7 @@ extern "C" {
* ramfs must be added to the prj before this enable
*/
#ifndef POSIX_CONFIG_DIRENT_TMPFILE_ENABLE
-#define POSIX_CONFIG_DIRENT_TMPFILE_ENABLE 1
+#define POSIX_CONFIG_DIRENT_TMPFILE_ENABLE 0
#endif
#ifndef POSIX_CONFIG_PRCTL_ENABLE
|
Add chisel plugin to firechip
|
@@ -260,6 +260,7 @@ lazy val firesimLib = ProjectRef(firesimDir, "firesimLib")
lazy val firechip = (project in file("generators/firechip"))
.dependsOn(chipyard, midasTargetUtils, midas, firesimLib % "test->test;compile->compile")
.settings(
+ chiselSettings,
commonSettings,
Test / testGrouping := isolateAllTests( (Test / definedTests).value ),
Test / testOptions += Tests.Argument("-oF")
|
pedantic is too much, let's fix wall first
|
PROJ_NAME = panda
-CFLAGS = -g -Wall -Wextra -pedantic -Wstrict-prototypes
+CFLAGS = -g -Wall -Wextra -Wstrict-prototypes
CFLAGS += -mlittle-endian -mthumb -mcpu=cortex-m4
CFLAGS += -mhard-float -DSTM32F4 -DSTM32F413xx -mfpu=fpv4-sp-d16 -fsingle-precision-constant
|
Bazel-Support: Give Bazel build job a name and pin it to Ubuntu 20.04
|
@@ -5,13 +5,14 @@ on:
jobs:
build:
- runs-on: ubuntu-latest
+ name: Linux Ubuntu 20.04 Bazel build <GCC 9.3.0>
+ runs-on: ubuntu-20.04
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v2
- name: Mount bazel cache
- uses: actions/cache@v1
+ uses: actions/cache@v2
with:
path: "/home/runner/.cache/bazel"
key: bazel
|
Clarify the usage of EVP_PKEY_get_raw_[private|public]_key()
EVP_PKEY_get_raw_private_key() and EVP_PKEY_get_raw_public_key() expect
the size of the key buffer to be populated in the |*len| parameter on
entry - but the docs made no mention of this.
Fixes
|
@@ -72,21 +72,24 @@ EVP_PKEY_new_mac_key() works in the same way as EVP_PKEY_new_raw_private_key().
New applications should use EVP_PKEY_new_raw_private_key() instead.
EVP_PKEY_get_raw_private_key() fills the buffer provided by B<priv> with raw
-private key data. The number of bytes written is populated in B<*len>. If the
-buffer B<priv> is NULL then B<*len> is populated with the number of bytes
-required to hold the key. The calling application is responsible for ensuring
-that the buffer is large enough to receive the private key data. This function
-only works for algorithms that support raw private keys. Currently this is:
-B<EVP_PKEY_HMAC>, B<EVP_PKEY_POLY1305>, B<EVP_PKEY_SIPHASH>, B<EVP_PKEY_X25519>,
-B<EVP_PKEY_ED25519>, B<EVP_PKEY_X448> or B<EVP_PKEY_ED448>.
+private key data. The size of the B<priv> buffer should be in B<*len> on entry
+to the function, and on exit B<*len> is updated with the number of bytes
+actually written. If the buffer B<priv> is NULL then B<*len> is populated with
+the number of bytes required to hold the key. The calling application is
+responsible for ensuring that the buffer is large enough to receive the private
+key data. This function only works for algorithms that support raw private keys.
+Currently this is: B<EVP_PKEY_HMAC>, B<EVP_PKEY_POLY1305>, B<EVP_PKEY_SIPHASH>,
+B<EVP_PKEY_X25519>, B<EVP_PKEY_ED25519>, B<EVP_PKEY_X448> or B<EVP_PKEY_ED448>.
EVP_PKEY_get_raw_public_key() fills the buffer provided by B<pub> with raw
-public key data. The number of bytes written is populated in B<*len>. If the
-buffer B<pub> is NULL then B<*len> is populated with the number of bytes
-required to hold the key. The calling application is responsible for ensuring
-that the buffer is large enough to receive the public key data. This function
-only works for algorithms that support raw public keys. Currently this is:
-B<EVP_PKEY_X25519>, B<EVP_PKEY_ED25519>, B<EVP_PKEY_X448> or B<EVP_PKEY_ED448>.
+public key data. The size of the B<pub> buffer should be in B<*len> on entry
+to the function, and on exit B<*len> is updated with the number of bytes
+actually written. If the buffer B<pub> is NULL then B<*len> is populated with
+the number of bytes required to hold the key. The calling application is
+responsible for ensuring that the buffer is large enough to receive the public
+key data. This function only works for algorithms that support raw public keys.
+Currently this is: B<EVP_PKEY_X25519>, B<EVP_PKEY_ED25519>, B<EVP_PKEY_X448> or
+B<EVP_PKEY_ED448>.
=head1 NOTES
|
fix:fix ethereum test case(test_001CreateWallet_0001CreateOneTimeWalletSuccess)
|
@@ -76,6 +76,7 @@ START_TEST(test_001CreateWallet_0001CreateOneTimeWalletSuccess)
{
BSINT32 rtnVal;
BoatEthWallet *g_ethereum_wallet_ptr = NULL;
+ BoatIotSdkInit();
BoatEthWalletConfig wallet = get_ethereum_wallet_settings();
extern BoatIotSdkContext g_boat_iot_sdk_context;
|
Update Status (fix
|
public struct Status
{
[FieldOffset(0x0)] public ushort StatusID;
+ // this contains different information depending on the type of status
+ // debuffs - stack count
+ // food/potions - ID of the food/potion in the ItemFood sheet
+ [FieldOffset(0x2)] public ushort Param;
+ // remains for compatibility
[FieldOffset(0x2)] public byte StackCount;
- [FieldOffset(0x3)] public byte Param;
-
[FieldOffset(0x4)] public float RemainingTime;
-
// objectID matching the entity that cast the effect - regens will be from the white mage ID etc
[FieldOffset(0x8)] public uint SourceID;
}
\ No newline at end of file
|
remove duplicate information from readme
|
@@ -4,8 +4,6 @@ KadNode finds the IP address of other instances on the Internet or local network
KadNode intercepts .p2p domain queries on the systems level and resolves them using a decentralized [DHT](https://de.wikipedia.org/wiki/DHT) network. [TLS](https://de.wikipedia.org/wiki/Transport_Layer_Security) authentication can be used to make sure the correct IP address was found. If successful, the IP address is passed to the application making the request.
-Supported are also domains consisting of public keys represented as characters. :-)
-
## Features:
* Support for two kinds of domains:
|
rp2/CMakeLists.txt: Enable USB enumeration fix.
This is a workaround for errata RP2040-E5, and is needed to make USB more
reliable on certain USB ports.
|
@@ -170,6 +170,7 @@ target_compile_definitions(${MICROPY_TARGET} PRIVATE
PICO_NO_PROGRAM_VERSION_STRING=1 # do it ourselves in main.c
MICROPY_BUILD_TYPE="${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} ${CMAKE_BUILD_TYPE}"
PICO_NO_BI_STDIO_UART=1 # we call it UART REPL
+ PICO_RP2040_USB_DEVICE_ENUMERATION_FIX=1
)
target_link_libraries(${MICROPY_TARGET}
|
Minor updates to readme text
|
@@ -19,7 +19,7 @@ QUIC has many benefits when compared to existing TLS over TCP scenarios:
* Exchange application data in the first round trip (0-RTT).
* Survives a change in the clients IP address or port.
* Easily extendable for new features and extensions.
- * Unreliable application data.
+ * Relaible and Unreliable delivery of application data.
* Stateless load balancing.
> **Important** The QUIC spec is currently in IETF last call and should move to IESG review by Nov 2020. From there it will likely take a few months before it is finalized to RFC.
|
webp-lossless-bitstream-spec: fix dist mapping example
The distance code read from the bitstream is reduced by 1 before doing
the lookup. The prose describing the lookup was correct, the pseudocode
failed to subtract 1 and used x/y instead of xi/yi from the lookup.
|
@@ -764,14 +764,14 @@ The mapping between distance code `i` and the neighboring pixel offset
For example, distance code `1` indicates an offset of `(0, 1)` for the
neighboring pixel, that is, the pixel above the current pixel (0 pixel
difference in X-direction and 1 pixel difference in Y-direction). Similarly,
-distance code `3` indicates left-top pixel.
+distance code `3` indicates the left-top pixel.
The decoder can convert a distance code `i` to a scan-line order distance
`dist` as follows:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-(xi, yi) = distance_map[i]
-dist = x + y * xsize
+(xi, yi) = distance_map[i - 1]
+dist = xi + yi * xsize
if (dist < 1) {
dist = 1
}
|
armv7: fixing thread context switching
|
@@ -74,7 +74,7 @@ disp_resume_context(struct dispatcher_shared_generic *disp, uint32_t *regs)
" ldmia r1, {r0-r15} \n\t"
"disp_resume_context_epilog: \n\t"
" mov r0, r0 ; nop \n\t"
- );
+ ::: "r0", "r1", "r2", "r3");
}
@@ -96,7 +96,7 @@ disp_save_context(uint32_t *regs)
" str r2, [r0, # (" XTR(PC_REG) " * 4)] \n\t"
"disp_save_context_resume: \n\t"
" bx lr \n\t"
- );
+ ::: "r0", "r1", "r2", "r3");
}
///////////////////////////////////////////////////////////////////////////////
@@ -156,13 +156,6 @@ void disp_switch(dispatcher_handle_t handle,
struct dispatcher_shared_arm *disp =
get_dispatcher_shared_arm(handle);
- // make sure arguments survive call to disp_save_context()
- // not sure if our code has a subtle bug or whether ARMv7 GCC
- // (arm-linux-gnueabi-gcc (Ubuntu/Linaro 5.3.1-13ubuntu3) 5.3.1 20160330)
- // is overeager when optimizing code that calls into
- // __attribute__((naked)) functions. -SG, 2016-04-06
- __asm volatile("" : /*out*/ : /*in*/ : "r0", "r1", "r2" );
-
assert_disabled(curdispatcher() == handle);
assert_disabled(disp->d.disabled);
assert_disabled(disp->d.haswork);
@@ -195,13 +188,6 @@ void disp_save(dispatcher_handle_t handle,
struct dispatcher_shared_arm *disp =
get_dispatcher_shared_arm(handle);
- // make sure arguments survive call to disp_save_context()
- // not sure if our code has a subtle bug or whether ARMv7 GCC
- // (arm-linux-gnueabi-gcc (Ubuntu/Linaro 5.3.1-13ubuntu3) 5.3.1 20160330)
- // is overeager when optimizing code that calls into
- // __attribute__((naked)) functions. -SG, 2016-04-06
- __asm volatile("" : /*out*/ : /*in*/ : "r0", "r1", "r2" );
-
assert_disabled(curdispatcher() == handle);
assert_disabled(disp->d.disabled);
|
added md5sum for psl233_viv17.4_vsec400h_Feb23
|
@@ -41,6 +41,7 @@ else
'51b64ad40a3dc54ec855d7d7dfef0896') export PSL_DCP_TYPE="ADKU3";; # rblack_PSLrev6_v174_20170122_vsec400
'3fa538efab1bc3e3fabe06477445d314') export PSL_DCP_TYPE="S121B";;
'8602200acb12d2de68c2a8a95735571a') export PSL_DCP_TYPE="S121B";;
+ '400d13185ce03f38776d672690618b2e') export PSL_DCP_TYPE="S121B";; # psl233_viv17.4_vsec400h_Feb23
'd051aa72ce08b60fd587a74a5146bf88') export PSL_DCP_TYPE="N250S OUTDATED";;
*) export PSL_DCP_TYPE="UNKNOWN";;
esac
|
relay: ensure a reload respects the listenbacklog
|
@@ -56,6 +56,7 @@ static unsigned short listenport = GRAPHITE_PORT;
static int optimiserthreshold = 50;
static int sockbufsize = 0;
static int collector_interval = 60;
+static unsigned int listenbacklog = 32;
static col_mode smode = CUM;
static dispatcher **workers = NULL;
static char workercnt = 0;
@@ -257,7 +258,7 @@ do_reload(void)
lsnrs = router_get_listeners(newrtr);
for ( ; lsnrs != NULL; lsnrs = lsnrs->next) {
if (!router_contains_listener(rtr, lsnrs)) {
- if (bindlisten(lsnrs, 32 /* FIXME */) != 0) {
+ if (bindlisten(lsnrs, listenbacklog) != 0) {
logerr("failed to setup listener, "
"this will impact the behaviour of the relay\n");
continue;
@@ -371,7 +372,6 @@ int
main(int argc, char * const argv[])
{
char id;
- unsigned int listenbacklog = 32;
int ch;
size_t numaggregators;
char *allowed_chars = NULL;
|
Add printing st-link version to st-info
|
@@ -35,11 +35,24 @@ static void stlink_print_serial(stlink_t *sl, bool openocd) {
printf("\n");
}
+static void stlink_print_version(stlink_t *sl) {
+ // Implementation of version printing is minimalistic
+ // but contains all available information from sl->version
+ printf("V%d", sl->version.stlink_v);
+ if (sl->version.jtag_v > 0)
+ printf("J%d", sl->version.jtag_v);
+ if (sl->version.swim_v > 0)
+ printf("S%d", sl->version.swim_v);
+ printf("\n");
+}
+
static void stlink_print_info(stlink_t *sl) {
const struct stlink_chipid_params *params = NULL;
if (!sl) { return; }
+ printf(" version: ");
+ stlink_print_version(sl);
printf(" serial: ");
stlink_print_serial(sl, false);
printf(" hla-serial: ");
@@ -62,7 +75,10 @@ static void stlink_probe(void) {
printf("Found %u stlink programmers\n", (unsigned int)size);
- for (size_t n = 0; n < size; n++) { stlink_print_info(stdevs[n]); }
+ for (size_t n = 0; n < size; n++) {
+ if (size>1) printf("%lu.\n", n+1);
+ stlink_print_info(stdevs[n]);
+ }
stlink_probe_usb_free(&stdevs, size);
}
|
parser: remove unused list and check its size(#4132)
|
@@ -195,6 +195,7 @@ struct flb_parser *flb_parser_create(const char *name, const char *format,
}
else {
flb_error("[parser:%s] Invalid format %s", name, format);
+ mk_list_del(&p->_head);
flb_free(p);
return NULL;
}
@@ -202,6 +203,7 @@ struct flb_parser *flb_parser_create(const char *name, const char *format,
if (p->type == FLB_PARSER_REGEX) {
if (!p_regex) {
flb_error("[parser:%s] Invalid regex pattern", name);
+ mk_list_del(&p->_head);
flb_free(p);
return NULL;
}
@@ -209,6 +211,7 @@ struct flb_parser *flb_parser_create(const char *name, const char *format,
regex = flb_regex_create(p_regex);
if (!regex) {
flb_error("[parser:%s] Invalid regex pattern %s", name, p_regex);
+ mk_list_del(&p->_head);
flb_free(p);
return NULL;
}
@@ -317,6 +320,7 @@ struct flb_parser *flb_parser_create(const char *name, const char *format,
void flb_parser_destroy(struct flb_parser *parser)
{
int i = 0;
+
if (parser->type == FLB_PARSER_REGEX) {
flb_regex_destroy(parser->regex);
flb_free(parser->p_regex);
@@ -867,8 +871,15 @@ struct flb_parser *flb_parser_get(const char *name, struct flb_config *config)
struct mk_list *head;
struct flb_parser *parser;
+ if (config == NULL || mk_list_size(&config->parsers) <= 0) {
+ return NULL;
+ }
+
mk_list_foreach(head, &config->parsers) {
parser = mk_list_entry(head, struct flb_parser, _head);
+ if (parser == NULL || parser->name == NULL) {
+ continue;
+ }
if (strcmp(parser->name, name) == 0) {
return parser;
}
|
cups-browsed: Fixed new leaks of IPP response structure after merging pull request
|
@@ -5860,10 +5860,12 @@ get_printer_attributes(const char* uri, int fallback_request,
"all",
};
httpClose(http_printer);
+ ippDelete(response);
debug_printf("The server doesn't support IPP2.0 request, trying request without media-col\n");
return get_printer_attributes(uri,2,pattr,job_state_attributes, 1);
}else if(fallback_request == 0){
httpClose(http_printer);
+ ippDelete(response);
debug_printf("The server doesn't support IPP2.0 request, trying IPP1.1 request\n");
return get_printer_attributes(uri,1,pattrs,job_state_attributes, attr_size);
}
|
Redefined u64 to use timestamp
|
@@ -101,12 +101,12 @@ static inline void sys_arch_unprotect(sys_prot_t x)
extern void console(char *);
typedef unsigned long long time;
-//extern timestamp now();
+extern timestamp now();
extern void lwip_debug(char * format, ...);
static inline u32_t sys_now(void)
{
- u64_t t = (u64_t)now();
+ timestamp t = now();
return (t * 1000) >> 32;
}
|
Fix changing treenew theme
|
@@ -349,14 +349,14 @@ BOOLEAN CALLBACK PhpThemeWindowEnumChildWindows(
case 0: // New colors
//PhSetWindowStyle(WindowHandle, WS_BORDER, WS_BORDER);
//PhSetWindowExStyle(WindowHandle, WS_EX_CLIENTEDGE, WS_EX_CLIENTEDGE);
+ TreeNew_ThemeSupport(WindowHandle, FALSE);
break;
case 1: // Old colors
//PhSetWindowStyle(WindowHandle, WS_BORDER, 0);
//PhSetWindowExStyle(WindowHandle, WS_EX_CLIENTEDGE, 0);
+ TreeNew_ThemeSupport(WindowHandle, TRUE);
break;
}
-
- TreeNew_ThemeSupport(WindowHandle, TRUE);
}
else if (PhEqualStringZ(windowClassName, L"ScrollBar", FALSE))
{
@@ -372,6 +372,7 @@ BOOLEAN CALLBACK PhpReInitializeThemeWindowEnumChildWindows(
)
{
ULONG processID = 0;
+ WCHAR windowClassName[MAX_PATH];
PhEnumChildWindows(
WindowHandle,
@@ -380,6 +381,26 @@ BOOLEAN CALLBACK PhpReInitializeThemeWindowEnumChildWindows(
0
);
+ if (!GetClassName(WindowHandle, windowClassName, RTL_NUMBER_OF(windowClassName)))
+ windowClassName[0] = 0;
+
+ if (PhEqualStringZ(windowClassName, L"PhTreeNew", FALSE))
+ {
+ switch (PhGetIntegerSetting(L"GraphColorMode"))
+ {
+ case 0: // New colors
+ //PhSetWindowStyle(WindowHandle, WS_BORDER, WS_BORDER);
+ //PhSetWindowExStyle(WindowHandle, WS_EX_CLIENTEDGE, WS_EX_CLIENTEDGE);
+ TreeNew_ThemeSupport(WindowHandle, FALSE);
+ break;
+ case 1: // Old colors
+ //PhSetWindowStyle(WindowHandle, WS_BORDER, 0);
+ //PhSetWindowExStyle(WindowHandle, WS_EX_CLIENTEDGE, 0);
+ TreeNew_ThemeSupport(WindowHandle, TRUE);
+ break;
+ }
+ }
+
GetWindowThreadProcessId(WindowHandle, &processID);
if (UlongToHandle(processID) == NtCurrentProcessId())
|
Fix Ip parser
|
@@ -174,17 +174,25 @@ lwespi_parse_string(const char** src, char* dst, size_t dst_len, uint8_t trim) {
*/
uint8_t
lwespi_parse_ip(const char** src, lwesp_ip_t* ip) {
- const char* p = *src;
- uint16_t first_entry;
+ const char* p = *src, *o_p;
+ char c;
if (*p == '"') {
++p;
}
- first_entry = lwespi_parse_number(&p);
+ /* TODO: Determine first which IP type it is */
+ o_p = p;
+
+ /* Find first separator */
+ for (size_t i = 0; i < 5 && p[i] != ':' && *p != ','; ++i) {}
+ c = *p;
+
+ /* Go to original value */
+ p = o_p;
if (0) {
#if LWESP_CFG_IPV6
- } else if (*p == ':') {
+ } else if (c == ':') {
ip->type = LWESP_IPTYPE_V6;
/*
@@ -195,9 +203,7 @@ lwespi_parse_ip(const char** src, lwesp_ip_t* ip) {
* not to keep wrong address
*/
memset(&ip->addr, 0x00, sizeof(ip->addr));
- ip->addr.ip6.addr[0] = first_entry;
- for (size_t i = 1; i < LWESP_ARRAYSIZE(ip->addr.ip6.addr); ++i) {
- ++p;
+ for (size_t i = 0; i < LWESP_ARRAYSIZE(ip->addr.ip6.addr); ++i, ++p) {
ip->addr.ip6.addr[i] = (uint16_t)lwespi_parse_number(&p);
if (*p != ':') {
break;
@@ -206,9 +212,7 @@ lwespi_parse_ip(const char** src, lwesp_ip_t* ip) {
#endif /* LWESP_CFG_IPV6 */
} else {
ip->type = LWESP_IPTYPE_V4;
- ip->addr.ip6.addr[0] = (uint8_t)first_entry;
- for (size_t i = 1; i < LWESP_ARRAYSIZE(ip->addr.ip4.addr); ++i) {
- ++p;
+ for (size_t i = 0; i < LWESP_ARRAYSIZE(ip->addr.ip4.addr); ++i, ++p) {
ip->addr.ip4.addr[i] = lwespi_parse_number(&p);
}
}
|
Examples/PPPoS: Fix pppos SMS send potential timeout in prompt waiting
|
@@ -59,7 +59,7 @@ static esp_err_t example_handle_cmgs(modem_dce_t *dce, const char *line)
#define MODEM_SMS_MAX_LENGTH (128)
#define MODEM_COMMAND_TIMEOUT_SMS_MS (120000)
-#define MODEM_PROMPT_TIMEOUT_MS (10)
+#define MODEM_PROMPT_TIMEOUT_MS (100)
static esp_err_t example_send_message_text(modem_dce_t *dce, const char *phone_num, const char *text)
{
|
fix killsnoop.py srr/bytes type error
Fix issue
|
@@ -139,7 +139,7 @@ def print_event(cpu, data, size):
if (args.failed and (event.ret >= 0)):
return
- printb(b"%-9s %-6d %-16s %-4d %-6d %d" % (strftime("%H:%M:%S"),
+ printb(b"%-9s %-6d %-16s %-4d %-6d %d" % (strftime("%H:%M:%S").encode('ascii'),
event.pid, event.comm, event.sig, event.tpid, event.ret))
# loop with callback to print_event
|
out_forward: set 2 workers by default
|
@@ -1340,6 +1340,7 @@ struct flb_output_plugin out_forward_plugin = {
.cb_pre_run = NULL,
.cb_flush = cb_forward_flush,
.cb_exit = cb_forward_exit,
+ .workers = 2,
/* Config map validator */
.config_map = config_map,
|
Little bit of maintenance on the github action
|
@@ -22,11 +22,12 @@ jobs:
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
submodules: true
- uses: lukka/get-cmake@latest
+ if: startsWith(matrix.os, 'win')
- name: Setup MacOS
if: startsWith(matrix.os, 'macOS')
|
viofs-pci: better handling of cancelable requests in EvtIoStop.
|
@@ -383,10 +383,18 @@ VOID VirtFsEvtIoStop(IN WDFQUEUE Queue,
IN WDFREQUEST Request,
IN ULONG ActionFlags)
{
- UNREFERENCED_PARAMETER(Queue);
+ PDEVICE_CONTEXT context = GetDeviceContext(WdfIoQueueGetDevice(Queue));
TraceEvents(TRACE_LEVEL_VERBOSE, DBG_IOCTL,
- "--> %!FUNC! Request: %p", Request);
+ "--> %!FUNC! Request: %p ActionFlags: 0x%08x", Request, ActionFlags);
+
+ if (ActionFlags & WdfRequestStopRequestCancelable)
+ {
+ if (WdfRequestUnmarkCancelable(Request) == STATUS_CANCELLED)
+ {
+ goto request_cancelled;
+ }
+ }
if (ActionFlags & WdfRequestStopActionSuspend)
{
@@ -394,12 +402,29 @@ VOID VirtFsEvtIoStop(IN WDFQUEUE Queue,
}
else if (ActionFlags & WdfRequestStopActionPurge)
{
- if (WdfRequestUnmarkCancelable(Request) != STATUS_CANCELLED)
+ PSINGLE_LIST_ENTRY iter;
+
+ WdfSpinLockAcquire(context->RequestsLock);
+ iter = &context->RequestsList;
+ while (iter->Next != NULL)
{
- WdfRequestComplete(Request , STATUS_CANCELLED);
+ PVIRTIO_FS_REQUEST removed = CONTAINING_RECORD(iter->Next,
+ VIRTIO_FS_REQUEST, ListEntry);
+
+ if (Request == removed->Request)
+ {
+ removed->Request = NULL;
+ break;
}
+
+ iter = iter->Next;
+ };
+ WdfSpinLockRelease(context->RequestsLock);
+
+ WdfRequestComplete(Request, STATUS_CANCELLED);
}
+request_cancelled:
TraceEvents(TRACE_LEVEL_VERBOSE, DBG_IOCTL, "<-- %!FUNC!");
}
|
Add --baud option to parttool
Closes
|
@@ -67,9 +67,10 @@ PARTITION_BOOT_DEFAULT = _PartitionId()
class ParttoolTarget():
- def __init__(self, port=None, partition_table_offset=PARTITION_TABLE_OFFSET, partition_table_file=None,
+ def __init__(self, port=None, baud=None, partition_table_offset=PARTITION_TABLE_OFFSET, partition_table_file=None,
esptool_args=[], esptool_write_args=[], esptool_read_args=[], esptool_erase_args=[]):
self.port = port
+ self.baud = baud
gen.offset_part_table = partition_table_offset
@@ -118,6 +119,9 @@ class ParttoolTarget():
if self.port:
esptool_args += ["--port", self.port]
+ if self.baud:
+ esptool_args += ["--baud", str(self.baud)]
+
esptool_args += args
with open(os.devnull, "w") as null_file:
@@ -220,6 +224,7 @@ def main():
# is specified, that is used instead.
parser.add_argument("--port", "-p", help="port where the target device of the command is connected to; the partition table is sourced from this device \
when the partition table file is not defined")
+ parser.add_argument("--baud", "-b", help="baudrate to use", type=int)
parser.add_argument("--partition-table-offset", "-o", help="offset to read the partition table from", type=str)
parser.add_argument("--partition-table-file", "-f", help="file (CSV/binary) to read the partition table from; \
@@ -282,6 +287,9 @@ def main():
if args.port:
target_args["port"] = args.port
+ if args.baud:
+ target_args["baud"] = args.baud
+
if args.partition_table_file:
target_args["partition_table_file"] = args.partition_table_file
|
HV: enable lapic passthru for logical partition VM1
|
@@ -50,7 +50,7 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
/* dd87ce08-66f9-473d-bc58-7605837f935e */
.pcpu_bitmap = VM1_CONFIG_PCPU_BITMAP,
.cpu_num = VM1_CONFIG_NUM_CPUS,
- .guest_flags = GUEST_FLAG_IO_COMPLETION_POLLING,
+ .guest_flags = (GUEST_FLAG_RT | GUEST_FLAG_LAPIC_PASSTHROUGH | GUEST_FLAG_IO_COMPLETION_POLLING),
.clos = 0U,
.memory = {
.start_hpa = VM1_CONFIG_MEM_START_HPA,
|
python/plugins: added errors and warnings to parentKey in set() and get() methods respectively
|
@@ -32,7 +32,7 @@ def check_key(key: kdb.Key):
return True
-class ElektraPlugin(object):
+class ElektraDNSPlugin(object):
def __init__(self):
pass
@@ -63,9 +63,14 @@ class ElektraPlugin(object):
returned.append(kdb.Key(mod+"/infos/description", kdb.KEY_VALUE, "checks if name is resolvable"))
return 1
+ warning_list = []
for k in returned:
if not check_key(k):
- print(f"couldn't resolve name for key: {k}")
+ warning_list.append(k)
+ print(f"Couldn't resolve domain name for key: {k}")
+
+ if warning_list:
+ parentKey.setMeta("warning", f"Couldn't resolve domain name for key(s): {warning_list}")
return -1
return 1
@@ -76,10 +81,14 @@ class ElektraPlugin(object):
# 0 : on success with no changed keys in database
# -1 : failure
"""
-
+ error_list = []
for k in returned:
if not check_key(k):
- print(f"couldn't validate key {k}")
+ error_list.append(k)
+ print(f"Couldn't validate key {k}")
+
+ if error_list:
+ parentKey.setMeta("error", f"Couldn't resolve domain name for key(s): {error_list}")
return -1
return 1
|
parallel-libs/mfem: relax file permissions
|
@@ -103,6 +103,8 @@ ln -s libmfem.so.3 libmfem.so
rm -f libmfem.a
popd
+find %{buildroot}%{install_path}/. -type f -exec chmod 644 -- {} +
+
# OpenHPC module file
%{__mkdir} -p %{buildroot}%{OHPC_MODULEDEPS}/%{compiler_family}-%{mpi_family}/%{pname}
%{__cat} << EOF > %{buildroot}/%{OHPC_MODULEDEPS}/%{compiler_family}-%{mpi_family}/%{pname}/%{version}
|
Add link to supported devices wiki page
|
@@ -25,6 +25,12 @@ Installation
Raspbian Wheezy and Qt4 is no longer maintained.
+##### Supported devices
+
+A uncomplete list of supported devices can be found here:
+
+https://github.com/dresden-elektronik/deconz-rest-plugin/wiki/Supported-Devices
+
### Install deCONZ
1. Download deCONZ package
|
I updated the script that calculates the release checksums for 2.13.0.
|
@@ -115,11 +115,13 @@ do
echo "" >> ../$output
$cmd INSTALL_NOTES >> ../$output
$cmd VisIt-$version.dmg >> ../$output
+ $cmd VisIt-$version-10.11.dmg >> ../$output
$cmd jvisit$version.tar.gz >> ../$output
$cmd visit${version}.exe >> ../$output
$cmd visit-install$version2 >> ../$output
$cmd visit${version}_x64.exe >> ../$output
$cmd visit$version2.darwin-x86_64.tar.gz >> ../$output
+ $cmd visit${version2}-10.11.darwin-x86_64.tar.gz >> ../$output
$cmd visit$version2.linux-x86_64-ubuntu11.tar.gz >> ../$output
$cmd visit$version2.linux-x86_64-ubuntu11-wmesa.tar.gz >> ../$output
$cmd visit$version2.linux-x86_64-ubuntu14.tar.gz >> ../$output
|
wasm: fix memory handling error
|
@@ -71,7 +71,7 @@ static int flb_wasm_load_wasm_binary(const char *wasm_path, int8_t **out_buf, ui
error:
- return -1;
+ return FLB_FALSE;
}
struct flb_wasm *flb_wasm_instantiate(struct flb_config *config, const char *wasm_path,
@@ -191,6 +191,9 @@ error:
if (buffer != NULL) {
BH_FREE(buffer);
}
+ if (fw != NULL) {
+ flb_free(fw);
+ }
wasm_runtime_destroy();
|
Add self-hosted execution example
|
#
# Running WASI verison with different engines:
# cp wasm3.wasm ./
+# ./run-spec-test.py --exec "../build/wasm3 wasm3.wasm --repl"
# ./run-spec-test.py --exec "wasmtime --dir=. wasm3.wasm -- --repl"
# ./run-spec-test.py --exec "wasmer run --dir=. wasm3.wasm -- --repl"
# ./run-spec-test.py --exec "wasmer run --dir=. --backend=llvm wasm3.wasm -- --repl"
|
power/mt8192: Apply chipset resume init and suspend complete hooks
BRANCH=cherry
TEST=make buildall -j
|
@@ -394,6 +394,11 @@ enum power_state power_handle_state(enum power_state state)
return POWER_S3;
case POWER_S3S0:
+#ifdef CONFIG_CHIPSET_RESUME_INIT_HOOK
+ /* Call hooks prior to chipset resume */
+ hook_notify(HOOK_CHIPSET_RESUME_INIT);
+#endif
+
if (power_wait_signals(IN_PGOOD_S0)) {
chipset_force_shutdown(CHIPSET_SHUTDOWN_WAIT);
return POWER_S0S3;
@@ -418,6 +423,10 @@ enum power_state power_handle_state(enum power_state state)
case POWER_S0S3:
/* Call hooks before we remove power rails */
hook_notify(HOOK_CHIPSET_SUSPEND);
+#ifdef CONFIG_CHIPSET_RESUME_INIT_HOOK
+ /* Call hooks after chipset suspend */
+ hook_notify(HOOK_CHIPSET_SUSPEND_COMPLETE);
+#endif
#ifdef CONFIG_POWER_SLEEP_FAILURE_DETECTION
sleep_suspend_transition();
|
Fix skybox shaders for WebGL;
|
@@ -107,7 +107,7 @@ const char* lovrCubeVertexShader = ""
"out vec3 texturePosition; \n"
"vec4 position(mat4 projection, mat4 transform, vec4 vertex) { \n"
" texturePosition = inverse(mat3(transform)) * (inverse(projection) * vertex).xyz; \n"
-" texturePosition.y *= -1; \n"
+" texturePosition.y *= -1.; \n"
" return vertex; \n"
"}";
@@ -123,7 +123,7 @@ const char* lovrPanoFragmentShader = ""
"vec4 color(vec4 graphicsColor, sampler2D image, vec2 uv) { \n"
" float theta = acos(texturePosition.y / length(texturePosition)); \n"
" float phi = atan(texturePosition.x, texturePosition.z); \n"
-" uv = vec2(.5 + phi / (2 * PI), theta / PI); \n"
+" uv = vec2(.5 + phi / (2. * PI), theta / PI); \n"
" return graphicsColor * texture(lovrDiffuseTexture, uv); \n"
"}";
|
Following the license change, modify the boilerplates in external/
[skip ci]
|
# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
#
-# Licensed under the OpenSSL license (the "License"). You may not use
+# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
# in the file LICENSE in the source distribution or at
# https://www.openssl.org/source/license.html
|
Fixed misprint in cmd_wget
|
@@ -1206,7 +1206,7 @@ int cmd_wget(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
FAR char *localfile = NULL;
FAR char *allocfile = NULL;
FAR char *buffer = NULL;
- FAR har *fullpath = NULL;
+ FAR char *fullpath = NULL;
FAR char *url;
FAR const char *fmt;
bool badarg = false;
|
net: remove goto
|
@@ -143,7 +143,7 @@ void dht_handler(int rc, int sock)
buflen = recvfrom(sock, buf, sizeof(buf) - 1, 0, (struct sockaddr*) &from, &fromlen);
if (buflen <= 0 || buflen >= sizeof(buf)) {
- goto end;
+ return;
}
// The DHT code expects the message to be null-terminated.
@@ -185,16 +185,14 @@ void dht_handler(int rc, int sock)
if (rc < 0) {
if (errno == EINTR) {
- goto end;
+ return;
} else if (rc == EINVAL || rc == EFAULT) {
log_error("KAD: Error using select: %s", strerror(errno));
- goto end;
+ return;
} else {
g_dht_maintenance = time_now_sec() + 1;
}
}
-
- end:;
}
/*
|
ASN.1: Refuse to encode to DER if non-optional items are missing
Fixes
|
@@ -217,7 +217,7 @@ static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
const ASN1_TEMPLATE *tt, int tag, int iclass)
{
const int flags = tt->flags;
- int i, ret, ttag, tclass, ndef;
+ int i, ret, ttag, tclass, ndef, len;
const ASN1_VALUE *tval;
/*
@@ -303,13 +303,16 @@ static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
/* Determine total length of items */
skcontlen = 0;
for (i = 0; i < sk_const_ASN1_VALUE_num(sk); i++) {
- int tmplen;
skitem = sk_const_ASN1_VALUE_value(sk, i);
- tmplen = ASN1_item_ex_i2d(&skitem, NULL, ASN1_ITEM_ptr(tt->item),
+ len = ASN1_item_ex_i2d(&skitem, NULL, ASN1_ITEM_ptr(tt->item),
-1, iclass);
- if (tmplen == -1 || (skcontlen > INT_MAX - tmplen))
+ if (len == -1 || (skcontlen > INT_MAX - len))
+ return -1;
+ if (len == 0 && (tt->flags & ASN1_TFLG_OPTIONAL) == 0) {
+ ERR_raise(ERR_LIB_ASN1, ASN1_R_ILLEGAL_ZERO_CONTENT);
return -1;
- skcontlen += tmplen;
+ }
+ skcontlen += len;
}
sklen = ASN1_object_size(ndef, skcontlen, sktag);
if (sklen == -1)
@@ -347,6 +350,10 @@ static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
i = ASN1_item_ex_i2d(pval, NULL, ASN1_ITEM_ptr(tt->item), -1, iclass);
if (!i)
return 0;
+ if (i == 0 && (tt->flags & ASN1_TFLG_OPTIONAL) == 0) {
+ ERR_raise(ERR_LIB_ASN1, ASN1_R_ILLEGAL_ZERO_CONTENT);
+ return -1;
+ }
/* Find length of EXPLICIT tag */
ret = ASN1_object_size(ndef, i, ttag);
if (out && ret != -1) {
@@ -360,9 +367,13 @@ static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
}
/* Either normal or IMPLICIT tagging: combine class and flags */
- return ASN1_item_ex_i2d(pval, out, ASN1_ITEM_ptr(tt->item),
+ len = ASN1_item_ex_i2d(pval, out, ASN1_ITEM_ptr(tt->item),
ttag, tclass | iclass);
-
+ if (len == 0 && (tt->flags & ASN1_TFLG_OPTIONAL) == 0) {
+ ERR_raise(ERR_LIB_ASN1, ASN1_R_ILLEGAL_ZERO_CONTENT);
+ return -1;
+ }
+ return len;
}
/* Temporary structure used to hold DER encoding of items for SET OF */
|
CLEANUP: remove some XXX_DELETE_NO_MERGE code tag.
|
@@ -5606,11 +5606,10 @@ static void do_coll_all_elem_delete(hash_item *it)
assert(info->head == NULL && info->tail == NULL);
} else if (IS_SET_ITEM(it)) {
set_meta_info *info = (set_meta_info *)item_get_meta(it);
-#ifdef SET_DELETE_NO_MERGE
- (void)do_set_elem_delete_fast(info, 0);
-#else
(void)do_set_elem_delete(info, 0, ELEM_DELETE_COLL);
-#endif
+ /***
+ (void)do_set_elem_delete_fast(info, 0);
+ ***/
assert(info->root == NULL);
} else if (IS_MAP_ITEM(it)) {
map_meta_info *info = (map_meta_info *)item_get_meta(it);
@@ -5618,14 +5617,13 @@ static void do_coll_all_elem_delete(hash_item *it)
assert(info->root == NULL);
} else if (IS_BTREE_ITEM(it)) {
btree_meta_info *info = (btree_meta_info *)item_get_meta(it);
-#ifdef BTREE_DELETE_NO_MERGE
+ (void)do_btree_elem_delete(info, BKEY_RANGE_TYPE_ASC, NULL, NULL,
+ 0, NULL, ELEM_DELETE_COLL);
+ /***
btree_elem_posi path[BTREE_MAX_DEPTH];
path[0].node = NULL;
(void)do_btree_elem_delete_fast(info, path, 0);
-#else
- (void)do_btree_elem_delete(info, BKEY_RANGE_TYPE_ASC, NULL, NULL,
- 0, NULL, ELEM_DELETE_COLL);
-#endif
+ ***/
assert(info->root == NULL);
}
}
@@ -5730,11 +5728,8 @@ static void *collection_delete_thread(void *arg)
while (dropped == false) {
LOCK_CACHE();
info = (set_meta_info *)item_get_meta(it);
-#ifdef SET_DELETE_NO_MERGE
- (void)do_set_elem_delete_fast(info, 30);
-#else
(void)do_set_elem_delete(info, 30, ELEM_DELETE_COLL);
-#endif
+ /* (void)do_set_elem_delete_fast(info, 30); */
if (info->ccnt == 0) {
assert(info->root == NULL);
do_item_free(it);
@@ -5761,19 +5756,16 @@ static void *collection_delete_thread(void *arg)
else if (IS_BTREE_ITEM(it)) {
bool dropped = false;
btree_meta_info *info = (btree_meta_info *)item_get_meta(it);
-#ifdef BTREE_DELETE_NO_MERGE
+ /***
btree_elem_posi path[BTREE_MAX_DEPTH];
path[0].node = NULL;
-#endif
+ ***/
while (dropped == false) {
LOCK_CACHE();
info = (btree_meta_info *)item_get_meta(it);
-#ifdef BTREE_DELETE_NO_MERGE
- (void)do_btree_elem_delete_fast(info, path, 100);
-#else
(void)do_btree_elem_delete(info, BKEY_RANGE_TYPE_ASC, NULL, NULL,
100, NULL, ELEM_DELETE_COLL);
-#endif
+ /* (void)do_btree_elem_delete_fast(info, path, 100); */
if (info->ccnt == 0) {
assert(info->root == NULL);
do_item_free(it);
|
Add ninja-build to the packages list to install
The package ninja-build should be installed automatically as a meson
dependency, but some users need to install a newer meson from pip3, so
ninja must be installed explicitly.
|
@@ -43,7 +43,7 @@ Install the required packages from your package manager.
sudo apt install ffmpeg libsdl2-2.0.0
# client build dependencies
-sudo apt install make gcc pkg-config meson \
+sudo apt install make gcc pkg-config meson ninja-build \
libavcodec-dev libavformat-dev libavutil-dev \
libsdl2-dev
|
Makefile: Whitespace cleanup
|
#
-# Copyright 2016, International Business Machines
+# Copyright 2016, 2017 International Business Machines
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
|
fix test main for MOBILE_BOOST_TEST_APK
|
@@ -5196,7 +5196,7 @@ module MOBILE_TEST_APK: DLL {
### @usage: MOBILE_BOOST_TEST_APK() # internal
module MOBILE_BOOST_TEST_APK: MOBILE_TEST_APK {
- # PEERDIR(library/testing/ya_boost_test)
+ PEERDIR(devtools/dummy_arcadia/test/test_apk/template)
PEERDIR(build/external_resources/mapsmobi_maven_repo)
ADD_YTEST($REALPRJNAME boost.test)
}
|
in_forward: removed unused variables
|
@@ -193,11 +193,8 @@ static void in_fw_pause(void *data, struct flb_config *config)
static int in_fw_exit(void *data, struct flb_config *config)
{
- struct mk_list *tmp;
- struct mk_list *head;
(void) *config;
struct flb_in_fw_config *ctx = data;
- struct fw_conn *conn;
if (!ctx) {
return 0;
|
If hit in COLD, immediately move to WARM
Ignores the wait period.
|
@@ -443,27 +443,33 @@ void do_item_update_nolock(item *it) {
/* Bump the last accessed time, or relink if we're in compat mode */
void do_item_update(item *it) {
MEMCACHED_ITEM_UPDATE(ITEM_key(it), it->nkey, it->nbytes);
- if (it->time < current_time - ITEM_UPDATE_INTERVAL) {
- assert((it->it_flags & ITEM_SLABBED) == 0);
+ /* Hits to COLD_LRU immediately move to WARM. */
+ if (settings.lru_maintainer_thread) {
+ assert((it->it_flags & ITEM_SLABBED) == 0);
if ((it->it_flags & ITEM_LINKED) != 0) {
- it->time = current_time;
// FIXME: do better LRU check.
- if (settings.lru_maintainer_thread) {
if (it->slabs_clsid >= COLD_LRU && it->slabs_clsid < NOEXP_LRU) {
+ it->time = current_time;
item_unlink_q(it);
it->slabs_clsid = ITEM_clsid(it);
it->slabs_clsid |= WARM_LRU;
it->it_flags &= ~ITEM_ACTIVE;
item_link_q_warm(it);
+ } else if (it->time < current_time - ITEM_UPDATE_INTERVAL) {
+ it->time = current_time;
}
- } else {
+ }
+ } else if (it->time < current_time - ITEM_UPDATE_INTERVAL) {
+ assert((it->it_flags & ITEM_SLABBED) == 0);
+
+ if ((it->it_flags & ITEM_LINKED) != 0) {
+ it->time = current_time;
item_unlink_q(it);
item_link_q(it);
}
}
}
-}
int do_item_replace(item *it, item *new_it, const uint32_t hv) {
MEMCACHED_ITEM_REPLACE(ITEM_key(it), it->nkey, it->nbytes,
|
feat: add a link about C vs C++
|
@@ -107,9 +107,15 @@ For example, a file called `test.h` should have:
Don't use `pragam once` which is not supported by all C/C++ compilers
+## C vs C++
+We use both C and C++'s namespace to achive the best code clarity. Even thought we only use C++'s namespace, some files have to be named with
+.cpp, which have to observe the rules of C++. This [link](https://stackoverflow.com/questions/31505402/does-c-contain-the-entire-c-language/31505447#31505447) has very good information about the difference between C and C++.
+
## MISC
For subjects that are not coverred here, we follow [Linux kernel coding style](https://www.kernel.org/doc/html/v4.10/process/coding-style.html#linux-kernel-coding-style)
## Commit and Merge
To avoid creating redundant merge commits the following methods are recommanded:
https://stackoverflow.com/questions/30052104/how-to-avoid-merge-commits-from-git-pull-when-pushing-to-remote
+
+
|
ssl: fix coverity resource leak
|
@@ -1384,8 +1384,10 @@ static int update_cipher_list(STACK_OF(SSL_CIPHER) **cipher_list,
sk_SSL_CIPHER_insert(tmp_cipher_list,
sk_SSL_CIPHER_value(tls13_ciphersuites, i), i);
- if (!update_cipher_list_by_id(cipher_list_by_id, tmp_cipher_list))
+ if (!update_cipher_list_by_id(cipher_list_by_id, tmp_cipher_list)) {
+ sk_SSL_CIPHER_free(tmp_cipher_list);
return 0;
+ }
sk_SSL_CIPHER_free(*cipher_list);
*cipher_list = tmp_cipher_list;
|
SOVERSION bump to version 1.3.23
|
@@ -48,7 +48,7 @@ set(LIBNETCONF2_VERSION ${LIBNETCONF2_MAJOR_VERSION}.${LIBNETCONF2_MINOR_VERSION
# with backward compatible change and micro version is connected with any internal change of the library.
set(LIBNETCONF2_MAJOR_SOVERSION 1)
set(LIBNETCONF2_MINOR_SOVERSION 3)
-set(LIBNETCONF2_MICRO_SOVERSION 22)
+set(LIBNETCONF2_MICRO_SOVERSION 23)
set(LIBNETCONF2_SOVERSION_FULL ${LIBNETCONF2_MAJOR_SOVERSION}.${LIBNETCONF2_MINOR_SOVERSION}.${LIBNETCONF2_MICRO_SOVERSION})
set(LIBNETCONF2_SOVERSION ${LIBNETCONF2_MAJOR_SOVERSION})
|
rnndb: Fix typo in new BLCG/SLCG regs for maxwell1+
oops :(
|
<reg32 offset="0x50" name="SLCG0" variants="GK110-"/>
<reg32 offset="0x35c" name="SLCG1" variants="GM107-"/>
- <reg32 offset="0x3c0" name="BLCG0" variants="GM107-"/>
+ <reg32 offset="0x3c8" name="BLCG0" variants="GM107-"/>
<reg32 offset="0x3e0" name="BLCG1" variants="GM107-"/>
<array name="SUBP_BROADCAST" offset="0x0800" stride="0x400" length="1">
|
ci: add extra jobs where needed as well as remove all unused jobs
|
@@ -447,7 +447,7 @@ UT_001:
UT_002:
extends: .unit_test_esp32_template
- parallel: 16
+ parallel: 14
tags:
- ESP32_IDF
- UT_T1_1
@@ -482,7 +482,7 @@ UT_006:
UT_007:
extends: .unit_test_esp32_template
- parallel: 2
+ parallel: 3
tags:
- ESP32_IDF
- UT_T1_1
@@ -508,19 +508,6 @@ UT_014:
- UT_T2_RS485
- psram
-UT_015:
- extends: .unit_test_esp32_template
- tags:
- - ESP32_IDF
- - UT_T1_RMT
-
-UT_016:
- extends: .unit_test_esp32_template
- tags:
- - ESP32_IDF
- - UT_T1_RMT
- - psram
-
UT_017:
extends: .unit_test_esp32_template
tags:
@@ -544,7 +531,6 @@ UT_020:
UT_021:
extends: .unit_test_esp32_template
- parallel: 2
tags:
- ESP32_IDF
- psram
@@ -579,7 +565,7 @@ UT_033:
UT_034:
extends: .unit_test_esp32_template
- parallel: 3
+ parallel: 2
tags:
- ESP32_IDF
- UT_T1_ESP_FLASH
@@ -607,7 +593,7 @@ UT_036:
UT_038:
extends: .unit_test_esp32s2_template
- parallel: 3
+ parallel: 2
tags:
- ESP32S2_IDF
- UT_T1_ESP_FLASH
@@ -660,7 +646,7 @@ UT_S2_SPI_DUAL:
UT_C3:
extends: .unit_test_esp32c3_template
- parallel: 33
+ parallel: 32
tags:
- ESP32C3_IDF
- UT_T1_1
@@ -674,7 +660,6 @@ UT_C3_FLASH:
UT_C3_SPI_DUAL:
extends: .unit_test_esp32c3_template
- parallel: 2
tags:
- ESP32C3_IDF
- Example_SPI_Multi_device
|
sys/log: Simplify log dump
Make common start/end for each log entry (i.e. timestamp + newline) and
also use console_write where possible to print simple strings instead of
going through formatting code.
|
@@ -58,26 +58,31 @@ shell_log_dump_entry(struct log *log, struct log_offset *log_offset,
}
data[rc] = 0;
+ console_printf("[%llu] ", ueh->ue_ts);
+
#if MYNEWT_VAL(LOG_VERSION) <= 2
- console_printf("[%llu] %s\n", ueh->ue_ts, data);
+ console_write(data, strlen(data));
#else
switch (ueh->ue_etype) {
case LOG_ETYPE_STRING:
- console_printf("[%llu] %s\n", ueh->ue_ts, data);
+ console_write(data, strlen(data));
break;
default:
- console_printf("[%llu] ", ueh->ue_ts);
for (off = 0; off < rc; off += blksz) {
blksz = dlen - off;
if (blksz > sizeof(tmp) >> 1) {
blksz = sizeof(tmp) >> 1;
}
hex_format(&data[off], blksz, tmp, sizeof(tmp));
- console_printf("%s", tmp);
+ console_write(tmp, strlen(tmp));
+ }
+ if (rc < len) {
+ console_write("...", 3);
}
- console_printf("%s\n", rc < len ? "..." : "");
}
#endif
+
+ console_write("\n", 1);
return 0;
}
|
Switch Xaml LayerProxy to use CGColor
|
@@ -85,7 +85,9 @@ void* LayerProxy::GetPropertyValue(const char* name) {
return [NSValue valueWithCATransform3D:trans];
} else if (strcmp(name, "borderColor") == 0) {
LayerColor color = _GetBorderColor();
- return [UIColor colorWithRed:color.r green:color.g blue:color.b alpha:color.a];
+ CGColorRef colorRef = CGColorCreateGenericRGB(color.r, color.g, color.b, color.a);
+ CFAutorelease(colorRef);
+ return static_cast<void*>(colorRef);
} else if (strcmp(name, "borderWidth") == 0) {
return [NSNumber numberWithFloat:_GetBorderWidth()];
}
@@ -174,22 +176,22 @@ void LayerProxy::UpdateProperty(const char* name, void* value) {
} else if (strcmp(name, "backgroundColor") == 0) {
LayerColor layerColor;
if (newValue) {
- const __CGColorQuad* color = [(UIColor*)newValue _getColors];
- layerColor.r = color->r;
- layerColor.g = color->g;
- layerColor.b = color->b;
- layerColor.a = color->a;
+ const CGFloat* color = CGColorGetComponents(static_cast<CGColorRef>(newValue));
+ layerColor.r = color[0];
+ layerColor.g = color[1];
+ layerColor.b = color[2];
+ layerColor.a = color[3];
}
_SetBackgroundColor(layerColor);
} else if (strcmp(name, "borderColor") == 0) {
LayerColor layerColor;
if (newValue) {
- const __CGColorQuad* color = [(UIColor*)newValue _getColors];
- layerColor.r = color->r;
- layerColor.g = color->g;
- layerColor.b = color->b;
- layerColor.a = color->a;
+ const CGFloat* color = CGColorGetComponents(static_cast<CGColorRef>(newValue));
+ layerColor.r = color[0];
+ layerColor.g = color[1];
+ layerColor.b = color[2];
+ layerColor.a = color[3];
}
_SetBorderColor(layerColor);
|
fixed sfx() reset
|
@@ -540,25 +540,16 @@ static void setChannelData(tic_mem* memory, s32 index, s32 note, s32 octave, s32
resetSfxPos(channel);
}
-static void resetChannelRegistersData(tic_mem* memory, s32 channel)
-{
- tic_machine* machine = (tic_machine*)memory;
- memset(&machine->state.registers.left[channel], 0, sizeof(tic_sound_register_data));
- memset(&machine->state.registers.right[channel], 0, sizeof(tic_sound_register_data));
-}
-
static void setMusicChannelData(tic_mem* memory, s32 index, s32 note, s32 octave, s32 left, s32 right, s32 channel)
{
tic_machine* machine = (tic_machine*)memory;
setChannelData(memory, index, note, octave, -1, &machine->state.music.channels[channel], left, right, SFX_DEF_SPEED);
- resetChannelRegistersData(memory, channel);
}
static void setSfxChannelData(tic_mem* memory, s32 index, s32 note, s32 octave, s32 duration, s32 channel, s32 left, s32 right, s32 speed)
{
tic_machine* machine = (tic_machine*)memory;
setChannelData(memory, index, note, octave, duration, &machine->state.sfx.channels[channel], left, right, speed);
- resetChannelRegistersData(memory, channel);
}
static void resetMusicChannels(tic_mem* memory)
|
.travis.yml: Detect if 'make update' updated something
If it did, it really is something that should be checked in, and should
therefore make a CI build fail.
|
@@ -184,7 +184,8 @@ script:
- if [ -n "$DESTDIR" ]; then
cd _build;
fi
- - $make update
+ - $make update;
+ git diff --quiet
- if [ -n "$CHECKDOCS" ]; then
$make doc-nits;
fi
|
libhfuzz: typos
|
@@ -298,7 +298,7 @@ ATTRIBUTE_X86_REQUIRE_SSE42 void __sanitizer_cov_trace_pc_guard_init(
guards_initialized = true;
static uint32_t n = 1U;
- /* Make sure that the feedback struct is mmapped */
+ /* Make sure that the feedback struct is already mmap()'d */
localInit();
for (uint32_t* x = start; x < stop; x++, n++) {
@@ -307,7 +307,7 @@ ATTRIBUTE_X86_REQUIRE_SSE42 void __sanitizer_cov_trace_pc_guard_init(
" (current module:%tu start:%p stop:%p)\n",
n, ((uintptr_t)stop - (uintptr_t)start) / sizeof(start), start, stop);
}
- /* If the corresponding PC was already hit, map this specific guard as uniteresting (0) */
+ /* If the corresponding PC was already hit, map this specific guard as uninteresting (0) */
*x = ATOMIC_GET(feedback->pcGuardMap[n]) ? 0U : n;
}
}
|
nlinv: optionally use lowmem for nufft objects
|
@@ -290,6 +290,7 @@ int main_nlinv(int argc, char* argv[argc])
struct nufft_conf_s nufft_conf = nufft_conf_defaults;
nufft_conf.toeplitz = false;
+ nufft_conf.lowmem = nufft_lowmem;
nufft_op = nufft_create(DIMS, ksp_dims, kgrid_dims, trj_dims, traj, NULL, nufft_conf);
|
[KConfig] Add RT_USING_WIFI option.
|
@@ -97,6 +97,9 @@ config RT_USING_WDT
bool "Using Watch Dog device drivers"
default n
+config RT_USING_WIFI
+ bool "Using Wi-Fi network"
+ default n
menu "Using USB"
config RT_USING_USB_HOST
|
take ESSID also proberequest
|
@@ -711,7 +711,7 @@ if(hccapxbestoutname != NULL)
{
if(memcmp(zeiger->mac_ap, zeigeressid->mac_ap, 6) == 0)
{
- if((zeigeressid->status != 1) && (memcmp(&essidold, zeigeressid->essid, zeigeressid->essidlen) != 0))
+ if(memcmp(&essidold, zeigeressid->essid, zeigeressid->essidlen) != 0)
{
zeiger->essidlen = zeigeressid->essidlen;
memset(zeiger->essid, 0, 32);
@@ -757,7 +757,7 @@ if(hccapxrawoutname != NULL)
{
if(memcmp(zeiger->mac_ap, zeigeressid->mac_ap, 6) == 0)
{
- if((zeigeressid->status != 1) && (memcmp(&essidold, zeigeressid->essid, zeigeressid->essidlen) != 0))
+ if(memcmp(&essidold, zeigeressid->essid, zeigeressid->essidlen) != 0)
{
zeiger->essidlen = zeigeressid->essidlen;
memset(zeiger->essid, 0, 32);
@@ -803,7 +803,7 @@ if(hccapbestoutname != NULL)
{
if(memcmp(zeiger->mac_ap, zeigeressid->mac_ap, 6) == 0)
{
- if((zeigeressid->status != 1) && (memcmp(&essidold, zeigeressid->essid, zeigeressid->essidlen) != 0))
+ if(memcmp(&essidold, zeigeressid->essid, zeigeressid->essidlen) != 0)
{
zeiger->essidlen = zeigeressid->essidlen;
memset(zeiger->essid, 0, 32);
@@ -849,7 +849,7 @@ if(hccaprawoutname != NULL)
{
if(memcmp(zeiger->mac_ap, zeigeressid->mac_ap, 6) == 0)
{
- if((zeigeressid->status != 1) && (memcmp(&essidold, zeigeressid->essid, zeigeressid->essidlen) != 0))
+ if(memcmp(&essidold, zeigeressid->essid, zeigeressid->essidlen) != 0)
{
zeiger->essidlen = zeigeressid->essidlen;
memset(zeiger->essid, 0, 32);
@@ -895,7 +895,7 @@ if(johnbestoutname != NULL)
{
if(memcmp(zeiger->mac_ap, zeigeressid->mac_ap, 6) == 0)
{
- if((zeigeressid->status != 1) && (memcmp(&essidold, zeigeressid->essid, zeigeressid->essidlen) != 0))
+ if(memcmp(&essidold, zeigeressid->essid, zeigeressid->essidlen) != 0)
{
zeiger->essidlen = zeigeressid->essidlen;
memset(zeiger->essid, 0, 32);
@@ -941,7 +941,7 @@ if(johnrawoutname != NULL)
{
if(memcmp(zeiger->mac_ap, zeigeressid->mac_ap, 6) == 0)
{
- if((zeigeressid->status != 1) && (memcmp(&essidold, zeigeressid->essid, zeigeressid->essidlen) != 0))
+ if(memcmp(&essidold, zeigeressid->essid, zeigeressid->essidlen) != 0)
{
zeiger->essidlen = zeigeressid->essidlen;
memset(zeiger->essid, 0, 32);
|
Fix TI CMake response file syntax
Corrects the syntax for specifying a response file to the TI
toolchain.
This resolves an issue when CMake attempted to build aws_tests.out on
Windows where, due to command line length limits, a response file was
being created and referenced incorrectly.
|
@@ -40,5 +40,5 @@ link_libraries(-llibc.a)
# Overwrite CMake archiver command for TI's compiler.
set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> a <TARGET> <LINK_FLAGS> <OBJECTS>")
-# Overwrite response file flag for TI's compiler.
-set(CMAKE_C_RESPONSE_FILE_LINK_FLAG "-cmd_file=")
+# Default response file flag is "@". TI's compiler doesn't require that.
+set(CMAKE_C_RESPONSE_FILE_LINK_FLAG "")
|
Fix back port from nghttp2
|
@@ -46,7 +46,7 @@ typedef struct {
ngtcp2_pq_entry **q;
/* Memory allocator */
ngtcp2_mem *mem;
- /* The number of items sotred */
+ /* The number of items stored */
size_t length;
/* The maximum number of items this pq can store. This is
automatically extended when length is reached to this value. */
|
Fixed deprecated mark_to_drop call in portfwd-gen.p
|
@@ -39,7 +39,7 @@ control ingress(inout headers hdr, inout metadata meta, inout standard_metadata_
hdr.ethernet.srcAddr = mac;
}
@name("._drop") action _drop() {
- mark_to_drop();
+ mark_to_drop(standard_metadata);
}
@name(".t_fwd") table t_fwd {
actions = {
|
zephyr/kconfig: put KB protocol because KB option
The PLATFORM_EC_KEYBOARD_PROTOCOL_8042 should be guarded
by the PLATFORM_EC_KEYBOARD option.
BRANCH=none
TEST=build posix-ec with CL stack
|
@@ -47,6 +47,8 @@ menuconfig PLATFORM_EC_KEYBOARD
keyboard_state_changed() (for i8042) or its client calling
keyboard_scan_get_state() (for MKBP).
+if PLATFORM_EC_KEYBOARD
+
choice "Protocol select"
prompt "Select the keyboard protocol to use"
@@ -62,6 +64,8 @@ config PLATFORM_EC_KEYBOARD_PROTOCOL_8042
endchoice # PLATFORM_EC_KEYBOARD
+endif # PLATFORM_EC_KEYBOARD
+
config PLATFORM_EC_CONSOLE_CMD_KEYBOARD_8042
bool "Enable the keyboard commands"
default y if PLATFORM_EC_KEYBOARD_PROTOCOL_8042
|
Uninstall: Add comment about directory order
|
@@ -69,7 +69,8 @@ set (DIRECTORIES
remove_directories ("${DIRECTORIES}")
-# The following directories might be empty
+# The following directories might be empty. The order of the directories is important, since we remove them in the given order.
+# A directory that occurs later in the list might be empty, since we removed all its subdirectories before.
set (REMOVAL_CANDIDATES
"/usr/local/bin"
"/usr/local/include"
|
cheza: Read board version from GPIO pins
BRANCH=none
TEST='version' command on ec console shows correct board version
Commit-Ready: ChromeOS CL Exonerator Bot
Tested-by: Philip Chen
|
#define CONFIG_HOSTCMD_SECTION_SORTED /* Host commands are sorted. */
#define CONFIG_MKBP_EVENT
-#define CONFIG_BOARD_VERSION
+#define CONFIG_BOARD_VERSION_GPIO
#define CONFIG_POWER_BUTTON
#define CONFIG_VOLUME_BUTTONS
#define CONFIG_SWITCH
|
test: fix typo in client encryption tests
|
@@ -24,11 +24,6 @@ describe('ClientEncryption', function() {
let client;
function setup() {
- if (requirements.SKIP_LIVE_TESTS) {
- this.test.skip();
- return;
- }
-
client = new MongoClient('mongodb://localhost:27017/test', { useNewUrlParser: true });
return client.connect().then(() =>
client
@@ -67,6 +62,11 @@ describe('ClientEncryption', function() {
});
beforeEach(function() {
+ if (requirements.SKIP_LIVE_TESTS) {
+ this.test.skip();
+ return;
+ }
+
return setup();
});
|
util/ecst.c: Fix resource leak
Found-by: Coverity Scan
Commit-Ready: Patrick Georgi
Tested-by: Patrick Georgi
|
@@ -984,8 +984,10 @@ int copy_file_to_file(char *dst_file_name,
/* Open the source file for read. */
src_file = fopen(src_file_name, "rb");
- if (src_file == NULL)
+ if (src_file == NULL) {
+ fclose(dst_file);
return 0;
+ }
/* Get the source file length in bytes. */
src_file_size = get_file_length(src_file);
|
in_head: deprecate old/unused stats interface
|
#include <fluent-bit/flb_config.h>
#include <fluent-bit/flb_error.h>
#include <fluent-bit/flb_utils.h>
-#include <fluent-bit/flb_stats.h>
#include <fluent-bit/flb_pack.h>
#include <msgpack.h>
@@ -153,7 +152,6 @@ static int single_value_per_record(struct flb_input_instance *i_ins,
ret = 0;
flb_input_buf_write_end(i_ins);
- flb_stats_update(in_head_plugin.stats_fd, 0, 1);
return ret;
@@ -220,7 +218,6 @@ static int split_lines_per_record(struct flb_input_instance *i_ins,
}
flb_input_buf_write_end(i_ins);
- flb_stats_update(in_head_plugin.stats_fd, 0, 1);
fclose(fp);
return 0;
|
GroupSettings: show feed settings correctly
|
@@ -66,7 +66,7 @@ export function GroupFeedSettings(props: {
</Label>
</Col>
</BaseLabel>
- {isEnabled && false && (
+ {isEnabled && (
<>
<GroupFeedPermsInput id="permissions" />
<FormSubmit start>Update Permissions</FormSubmit>
|
Test non-ASCII characters in entity names
Use character with value > 0x00ff for extra code coverage
|
@@ -5240,6 +5240,29 @@ START_TEST(test_invalid_character_entity_2)
}
END_TEST
+START_TEST(test_invalid_character_entity_3)
+{
+ const char text[] =
+ /* <!DOCTYPE doc [\n */
+ "\0<\0!\0D\0O\0C\0T\0Y\0P\0E\0 \0d\0o\0c\0 \0[\0\n"
+ /* U+0E04 = KHO KHWAI
+ * U+0E08 = CHO CHAN */
+ /* <!ENTITY entity '&\u0e04\u0e08;'>\n */
+ "\0<\0!\0E\0N\0T\0I\0T\0Y\0 \0e\0n\0t\0i\0t\0y\0 "
+ "\0'\0&\x0e\x04\x0e\x08\0;\0'\0>\0\n"
+ /* ]>\n */
+ "\0]\0>\0\n"
+ /* <doc>&entity;</doc> */
+ "\0<\0d\0o\0c\0>\0&\0e\0n\0t\0i\0t\0y\0;\0<\0/\0d\0o\0c\0>";
+
+ if (_XML_Parse_SINGLE_BYTES(parser, text, sizeof(text)-1,
+ XML_TRUE) != XML_STATUS_ERROR)
+ fail("Invalid start of entity name not faulted");
+ if (XML_GetErrorCode(parser) != XML_ERROR_UNDEFINED_ENTITY)
+ xml_failure(parser);
+}
+END_TEST
+
/* Test that processing instructions are picked up by a default handler */
START_TEST(test_pi_handled_in_default)
{
@@ -11340,6 +11363,7 @@ make_suite(void)
tcase_add_test(tc_basic, test_param_entity_with_trailing_cr);
tcase_add_test(tc_basic, test_invalid_character_entity);
tcase_add_test(tc_basic, test_invalid_character_entity_2);
+ tcase_add_test(tc_basic, test_invalid_character_entity_3);
tcase_add_test(tc_basic, test_pi_handled_in_default);
tcase_add_test(tc_basic, test_comment_handled_in_default);
tcase_add_test(tc_basic, test_pi_yml);
|
Indentation of add_to_synopsis
|
@@ -982,7 +982,7 @@ function generate_man_page(fx, mem) {
t += "#include <libdill.h>\n\n"
}
if(fx.add_to_synopsis) {
- t += fx.add_to_synopsis.trim() + "\n\n"
+ t += trimrect(fx.add_to_synopsis) + "\n\n"
}
t += fx.result.type + " " + fx.name
if(mem) t += "_mem"
|
[Rust] Update unit tests
|
@@ -291,10 +291,10 @@ fn fill_rect() {
let bytes_per_row = layer.bytes_per_pixel * layer.size.width;
for y in 0..100 {
for x in 0..100 {
- let off = (y * bytes_per_row) + (x * layer.bytes_per_pixel);
- assert_eq!(fb[off + 0], color.r);
+ let off = ((y * bytes_per_row) + (x * layer.bytes_per_pixel)) as usize;
+ assert_eq!(fb[off + 0], color.b);
assert_eq!(fb[off + 1], color.g);
- assert_eq!(fb[off + 2], color.b);
+ assert_eq!(fb[off + 2], color.r);
}
}
}
@@ -317,11 +317,11 @@ fn fill_rect_constrains_rect() {
for y in 0..100 {
for x in 0..100 {
let p = Point::new(x, y);
- let off = (y * bytes_per_row) + (x * layer.bytes_per_pixel);
+ let off = ((y * bytes_per_row) + (x * layer.bytes_per_pixel)) as usize;
if expected_rect.contains(p) {
- assert_eq!(fb[off + 0], color.r);
+ assert_eq!(fb[off + 0], color.b);
assert_eq!(fb[off + 1], color.g);
- assert_eq!(fb[off + 2], color.b);
+ assert_eq!(fb[off + 2], color.r);
} else {
assert_eq!(fb[off + 0], 0);
assert_eq!(fb[off + 1], 0);
|
Fix OneBranch yml
|
@@ -167,6 +167,6 @@ extends:
- build_uwp
jobs:
- template: .azure/obtemplates/build-nuget.yml@self
- ${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags/')) }}:
+ ${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags/') }}:
parameters:
release: true
|
Remove config callback from radio driver, it is not part of the
mac device contract anymore. Increment sequence counter and expose
setting transmit power to userspace
|
@@ -23,12 +23,12 @@ const int COM_COMMIT = 7;
const int EVT_TX = 0;
const int EVT_RX = 1;
-const int EVT_CFG = 2;
int radio_init(void) {
+ // Spin until radio is on
while (!radio_ready()) {}
- return 0;
-} // Do nothing for now
+ return TOCK_SUCCESS;
+}
int rx_result = 0;
int rx_payload_len = 0;
@@ -51,13 +51,6 @@ static void cb_rx(int result,
*((bool*)ud) = true;
}
-static void cb_config(__attribute__ ((unused)) int unused0,
- __attribute__ ((unused)) int unused1,
- __attribute__ ((unused)) int unused2,
- void* ud) {
- *((bool*)ud) = true;
-}
-
// packet contains the payload of the 802.15.4 packet; this will
// be copied into a packet buffer with header space within the kernel.
int radio_send(unsigned short addr, const char* packet, unsigned char len) {
@@ -103,17 +96,7 @@ int radio_set_power(char power) {
}
int radio_commit(void) {
- bool cond = false;
- int err = subscribe(SYS_RADIO, EVT_CFG, cb_config, &cond);
- if (err != TOCK_SUCCESS) {
- return err;
- }
- err = command(SYS_RADIO, COM_COMMIT, 0);
- if (err != TOCK_SUCCESS) {
- return err;
- }
- yield_for(&cond);
- return TOCK_SUCCESS;
+ return command(SYS_RADIO, COM_COMMIT, 0);
}
// Valid channels are 10-26
|
Require effectful func's args to be effect-free
|
@@ -1078,6 +1078,15 @@ func (p *parser) parseOperand() (*a.Expr, error) {
if err != nil {
return nil, err
}
+ if flags.AsEffect() != 0 {
+ for _, arg := range args {
+ o := arg.AsArg().Value()
+ if o.Effect() != 0 {
+ return nil, fmt.Errorf(`parse: effectful function call %q has effectful argument %q at %s:%d`,
+ lhs.Str(p.tm), o.Str(p.tm), p.filename, p.line())
+ }
+ }
+ }
lhs = a.NewExpr(flags, t.IDOpenParen, 0, 0, lhs.AsNode(), nil, nil, args)
case t.IDOpenBracket:
|
Don't try stream-index join path for hash and merge joins
|
@@ -551,7 +551,7 @@ try_stream_index_join_path(PlannerInfo *root,
NestPath *path;
/* if there's no index path, we'll use the stream-table hashjoin */
- if (inner_path->pathtype == T_SeqScan)
+ if (inner_path->pathtype == T_SeqScan || inner_path->pathtype == T_HashJoin || inner_path->pathtype == T_MergeJoin)
return;
path = create_nestloop_path(root, joinrel, jointype, &workspace,
@@ -559,9 +559,10 @@ try_stream_index_join_path(PlannerInfo *root,
restrict_clauses,
pathkeys, required_outer);
- /* we only care about the cost of the table side of a stream-table join */
path->path.startup_cost = 0;
+ /* We only care about the cost of the table side of a stream-table join */
path->path.total_cost = inner_path->total_cost;
+
add_path(joinrel, (Path *) path);
}
|
docs(setup): replace `zephyr-west-action` with `zmk-docker`
This should've been changed after
See:
PR:
|
@@ -188,7 +188,7 @@ brew install cmake ninja python3 ccache dtc git wget dfu-util
</TabItem>
<TabItem value="docker">
-This setup leverages the same [image which is used by the GitHub action](https://github.com/zmkfirmware/zephyr-west-action) for local development. Beyond the benefits of [dev/prod parity](https://12factor.net/dev-prod-parity), this approach is also the easiest to set up. No toolchain or dependencies are necessary when using Docker; the container image you'll be using already has the toolchain installed and set up to use.
+This setup leverages the same [image which is used by the GitHub action](https://github.com/zmkfirmware/zmk-docker) for local development. Beyond the benefits of [dev/prod parity](https://12factor.net/dev-prod-parity), this approach is also the easiest to set up. No toolchain or dependencies are necessary when using Docker; the container image you'll be using already has the toolchain installed and set up to use.
1. Install [Docker Desktop](https://www.docker.com/products/docker-desktop) for your operating system.
2. Install [VS Code](https://code.visualstudio.com/)
|
Fix dprintf conformance
|
@@ -37,7 +37,7 @@ PHLIBAPI extern ULONG WindowsVersion;
// Debugging
#ifdef DEBUG
-#define dprintf(format, ...) DbgPrint(format, __VA_ARGS__)
+#define dprintf(format, ...) DbgPrint(format, ##__VA_ARGS__)
#else
#define dprintf(format, ...)
#endif
|
ModelData exposes its Blobs and Images;
|
+#include "api.h"
+#include "data/modelData.h"
+#include <lua.h>
#include <lauxlib.h>
+static int l_lovrModelDataGetBlobCount(lua_State* L) {
+ ModelData* model = luax_checktype(L, 1, ModelData);
+ lua_pushinteger(L, model->blobCount);
+ return 1;
+}
+
+static int l_lovrModelDataGetBlob(lua_State* L) {
+ ModelData* model = luax_checktype(L, 1, ModelData);
+ uint32_t index = luaL_checkinteger(L, 2) - 1;
+ lovrCheck(index < model->blobCount, "Invalid Blob index #%d", index + 1);
+ luax_pushtype(L, Blob, model->blobs[index]);
+ return 1;
+}
+
+static int l_lovrModelDataGetImageCount(lua_State* L) {
+ ModelData* model = luax_checktype(L, 1, ModelData);
+ lua_pushinteger(L, model->imageCount);
+ return 1;
+}
+
+static int l_lovrModelDataGetImage(lua_State* L) {
+ ModelData* model = luax_checktype(L, 1, ModelData);
+ uint32_t index = luaL_checkinteger(L, 2) - 1;
+ lovrCheck(index < model->imageCount, "Invalid Image index #%d", index + 1);
+ luax_pushtype(L, Image, model->images[index]);
+ return 1;
+}
+
const luaL_Reg lovrModelData[] = {
+ { "getBlobCount", l_lovrModelDataGetBlobCount },
+ { "getBlob", l_lovrModelDataGetBlob },
+ { "getImageCount", l_lovrModelDataGetImageCount },
+ { "getImage", l_lovrModelDataGetImage },
{ NULL, NULL }
};
|
Documentation: Fix minor grammar mistake
|
@@ -73,7 +73,7 @@ Thus please use following techniques (in order of preference):
`#include <kdblogger.h>`
- `ELEKTRA_LOG ("formatted text to be printed according log filters", ...)`
+ `ELEKTRA_LOG ("formatted text to be printed according to log filters", ...)`
Read [HERE](/doc/dev/logging.md) for how to enable the logger.
|
netkvm: remove explicit call of send queue destructor
|
@@ -281,8 +281,6 @@ CParaNdisTX::~CParaNdisTX()
NBL = m_SendQueue.Dequeue();
}
- m_SendQueue.~CLockFreeDynamicQueue();
-
DPrintf(1, "Pools state %d-> NB: %d, NBL: %d\n", m_queueIndex, m_nbPool.GetCount(), m_nblPool.GetCount());
if (m_StateMachineRegistered)
{
|
ccomp_timer: fix broken unit test
|
@@ -214,15 +214,15 @@ TEST_CASE("Can allocate IRAM int only with an IRAM handler", "[esp32]")
{
}
intr_handle_t ih;
- esp_err_t err = esp_intr_alloc(ETS_INTERNAL_PROFILING_INTR_SOURCE,
+ esp_err_t err = esp_intr_alloc(ETS_INTERNAL_SW0_INTR_SOURCE,
ESP_INTR_FLAG_IRAM, &dummy, NULL, &ih);
TEST_ASSERT_EQUAL_INT(ESP_ERR_INVALID_ARG, err);
- err = esp_intr_alloc(ETS_INTERNAL_PROFILING_INTR_SOURCE,
+ err = esp_intr_alloc(ETS_INTERNAL_SW0_INTR_SOURCE,
ESP_INTR_FLAG_IRAM, &dummy_iram, NULL, &ih);
TEST_ESP_OK(err);
err = esp_intr_free(ih);
TEST_ESP_OK(err);
- err = esp_intr_alloc(ETS_INTERNAL_PROFILING_INTR_SOURCE,
+ err = esp_intr_alloc(ETS_INTERNAL_SW0_INTR_SOURCE,
ESP_INTR_FLAG_IRAM, &dummy_rtc, NULL, &ih);
TEST_ESP_OK(err);
err = esp_intr_free(ih);
|
process: write first readme version
|
- infos = Information about the process plugin is in keys below
- infos/author = Armin Wurzinger <e1528532@libelektra.org>
- infos/licence = BSD
-- infos/needs =
+- infos/needs = dump
- infos/provides =
- infos/recommends =
- infos/placements = prerollback rollback postrollback getresolver pregetstorage getstorage postgetstorage setresolver presetstorage setstorage precommit commit postcommit
@@ -18,12 +18,11 @@ process.
## Usage
-To use this plugin, simply mount a file with the process plugin and specify the
-plugin that should be proxied with the key `process=`.
+Mount this plugin and specify the plugin configuration parameter `plugin` to a plugin that exists on the system. The proxied plugin will then be executed in a separate process and this plugin handles the communication between the processes.
## Dependencies
-None.
+The `pluginprocess` library, which is only available on POSIX environments currently.
## Examples
@@ -45,4 +44,4 @@ sudo kdb umount /tests/process
## Limitations
-None.
+This plugin cannot act as a proxy for itself to prevent loops.
|
nimble/mesh: Fix native build
This patch adds code needed to run Mesh app on simulator.
|
@@ -566,10 +566,16 @@ struct shell_cmd_help cmd_lpn_help = {
#endif /* MESH_LOW_POWER */
-static int check_addr_unassigned(uint8_t addr[BLE_DEV_ADDR_LEN])
+static int check_pub_addr_unassigned(void)
{
- return memcmp(addr, (uint8_t[BLE_DEV_ADDR_LEN]){0, 0, 0, 0, 0, 0},
- BLE_DEV_ADDR_LEN) == 0;
+#ifdef ARCH_sim
+ return 0;
+#else
+ uint8_t zero_addr[BLE_DEV_ADDR_LEN] = { 0 };
+
+ return memcmp(MYNEWT_VAL(BLE_PUBLIC_DEV_ADDR),
+ zero_addr, BLE_DEV_ADDR_LEN) == 0;
+#endif
}
static int cmd_init(int argc, char *argv[])
@@ -577,7 +583,7 @@ static int cmd_init(int argc, char *argv[])
int err;
ble_addr_t addr;
- if (check_addr_unassigned(MYNEWT_VAL(BLE_PUBLIC_DEV_ADDR))) {
+ if (check_pub_addr_unassigned()) {
/* Use NRPA */
err = ble_hs_id_gen_rnd(1, &addr);
assert(err == 0);
|
ci more debugging for formatting action
|
@@ -4,6 +4,10 @@ on:
types: [created]
jobs:
+ test-github:
+ runs-on: ubuntu-latest
+ steps:
+ - run: echo '${{ toJSON(github) }}'
update-formatting:
continue-on-error: true
if: github.event.issue.pull_request && github.event.issue.user.login == github.event.pull_request.user.login
|
fix: init RP and BSR on restart
|
@@ -807,6 +807,7 @@ static void restart(int signo)
init_routesock(); /* Both for Linux netlink and BSD routing socket */
init_pim_mrt();
init_vifs();
+ init_rp_and_bsr(); /* Must be after init_vifs() */
add_static_rp(); /* Must be after init_vifs() */
ipc_init(sock_file);
|
Fix comments in psa_crypto_pake.c
|
* | | psa_pake_set_password_key()
* | | psa_pake_set_user()
* | | psa_pake_set_peer()
- * | | psa_pake_set_role
+ * | | psa_pake_set_role()
* |
* |--- In any order: (First round input before or after first round output)
* | |
@@ -449,7 +449,7 @@ psa_status_t psa_pake_output( psa_pake_operation_t *operation,
}
else
{
- /* Length is stored at the first byte */
+ /* Length is stored at the first byte of the next chunk */
length = operation->buffer[operation->buffer_offset] + 1;
}
|
Update sprite_eng.c
small fix in SPR_end() so first and last sprite pointer are cleared as well.
|
@@ -157,9 +157,13 @@ void SPR_end()
{
if (SPR_isInitialized())
{
+ // no active sprites
+ firstSprite = NULL;
+ lastSprite = NULL;
+
// reset and clear VDP sprite
VDP_resetSprites();
- VDP_updateSprites(1, DMA_QUEUE_COPY);
+ VDP_updateSprites(1, DMA_QUEUE);
// release memory
POOL_destroy(spritesPool);
|
fix vsxmake env
|
<_XmakeExecutable>"$([System.IO.Path]::GetFullPath('$(XmakeProgramDirResolved)xmake.exe'))"</_XmakeExecutable>
<_XmakeEnv>
chcp 65001 > NUL
+ pushd $(XmakeProjectDirResolved)
set XMAKE_CONFIGDIR=$(XmakeConfigDirResolved.TrimEnd('/\'.ToCharArray()))
set XMAKE_PROGRAM_DIR=$(XmakeProgramDirResolved.TrimEnd('/\'.ToCharArray()))
</_XmakeEnv>
</Target>
<Target Name="_XmakeConfig" DependsOnTargets="_XmakeProjCheck">
<Message Text="$xmake config $(_XmakeCommonFlags) $(_XmakeConfigFlags) $(XmakeTarget)" Importance="High" />
- <Exec WorkingDirectory="$(XmakeProjectDirResolved)" StdOutEncoding="utf-8" StdErrEncoding="utf-8" Command="$(_XmakeEnv)
+ <Exec StdOutEncoding="utf-8" StdErrEncoding="utf-8" Command="$(_XmakeEnv)
$(_XmakeExecutable) config $(_XmakeCommonFlags) $(_XmakeConfigFlags) $(XmakeTarget)" EchoOff="true" />
</Target>
<Target Name="_XmakeReconfig" DependsOnTargets="_XmakeProjCheck">
<Message Text="$xmake config $(_XmakeCommonFlags) -c $(_XmakeConfigFlags) $(XmakeTarget)" Importance="High" />
- <Exec WorkingDirectory="$(XmakeProjectDirResolved)" StdOutEncoding="utf-8" StdErrEncoding="utf-8" Command="$(_XmakeEnv)
+ <Exec StdOutEncoding="utf-8" StdErrEncoding="utf-8" Command="$(_XmakeEnv)
$(_XmakeExecutable) config $(_XmakeCommonFlags) -c $(_XmakeConfigFlags) $(XmakeTarget)" EchoOff="true" />
</Target>
<Target Name="_XmakeBuild" DependsOnTargets="_XmakeProjCheck">
<Message Text="$xmake build $(_XmakeCommonFlags) $(_XmakeBuildFlags) $(XmakeTarget)" Importance="High" />
- <Exec WorkingDirectory="$(XmakeProjectDirResolved)" StdOutEncoding="utf-8" StdErrEncoding="utf-8" Command="$(_XmakeEnv)
+ <Exec StdOutEncoding="utf-8" StdErrEncoding="utf-8" Command="$(_XmakeEnv)
$(_XmakeExecutable) build $(_XmakeCommonFlags) $(_XmakeBuildFlags) $(XmakeTarget)" EchoOff="true" />
</Target>
<Target Name="_XmakeBuildFile" DependsOnTargets="_XmakeProjCheck">
<FileFlag>--files="$(FileList)"</FileFlag>
</PropertyGroup>
<Message Text="$xmake build $(_XmakeCommonFlags) $(_XmakeBuildFileFlags) $(FileFlag) $(XmakeTarget)" Importance="High" />
- <Exec WorkingDirectory="$(XmakeProjectDirResolved)" StdOutEncoding="utf-8" StdErrEncoding="utf-8" Command="$(_XmakeEnv)
+ <Exec StdOutEncoding="utf-8" StdErrEncoding="utf-8" Command="$(_XmakeEnv)
$(_XmakeExecutable) build $(_XmakeCommonFlags) $(_XmakeBuildFileFlags) $(FileFlag) $(XmakeTarget)" EchoOff="true" />
</Target>
<Target Name="_XmakeClean" DependsOnTargets="_XmakeProjCheck">
<Message Text="$xmake clean $(_XmakeCommonFlags) -a $(_XmakeCleanFlags) $(XmakeTarget)" Importance="High" />
- <Exec WorkingDirectory="$(XmakeProjectDirResolved)" StdOutEncoding="utf-8" StdErrEncoding="utf-8" Command="$(_XmakeEnv)
+ <Exec StdOutEncoding="utf-8" StdErrEncoding="utf-8" Command="$(_XmakeEnv)
$(_XmakeExecutable) clean $(_XmakeCommonFlags) -a $(_XmakeCleanFlags) $(XmakeTarget)" EchoOff="true" />
</Target>
|
extend unions for struct api
|
@@ -47,6 +47,21 @@ typedef union vec2s {
float x;
float y;
};
+
+ struct {
+ float r;
+ float i;
+ };
+
+ struct {
+ float u;
+ float v;
+ };
+
+ struct {
+ float s;
+ float t;
+ };
#endif
} vec2s;
@@ -58,6 +73,12 @@ typedef union vec3s {
float y;
float z;
};
+
+ struct {
+ float r;
+ float g;
+ float b;
+ };
#endif
} vec3s;
@@ -68,6 +89,21 @@ typedef union ivec2s {
int x;
int y;
};
+
+ struct {
+ int r;
+ int i;
+ };
+
+ struct {
+ int u;
+ int v;
+ };
+
+ struct {
+ int s;
+ int t;
+ };
#endif
} ivec2s;
@@ -79,6 +115,12 @@ typedef union ivec3s {
int y;
int z;
};
+
+ struct {
+ int r;
+ int g;
+ int b;
+ };
#endif
} ivec3s;
@@ -91,6 +133,13 @@ typedef union ivec4s {
int z;
int w;
};
+
+ struct {
+ int r;
+ int g;
+ int b;
+ int a;
+ };
#endif
} ivec4s;
@@ -103,6 +152,13 @@ typedef union CGLM_ALIGN_IF(16) vec4s {
float z;
float w;
};
+
+ struct {
+ float r;
+ float g;
+ float b;
+ float a;
+ };
#endif
} vec4s;
|
Segfault in exists calls
Seems we just need to call the tracing macros before invoking
the callback. Others did so, just the exists did not.
Tested-by: Build Bot
|
@@ -477,9 +477,9 @@ static void H_exists(mc_PIPELINE *pipeline, mc_PACKET *request, MemcachedRespons
resp.seqno = lcb_ntohll(resp.seqno);
}
}
- invoke_callback(request, root, &resp, LCB_CALLBACK_EXISTS);
LCBTRACE_KV_FINISH(pipeline, request, resp, response);
TRACE_EXISTS_END(root, request, response, &resp);
+ invoke_callback(request, root, &resp, LCB_CALLBACK_EXISTS);
}
static void
|
documentation: 4.0.2 reference -> 4.1.0
|
@@ -53,7 +53,7 @@ These SDK libraries are managed by CARTO and include all the required libraries
// Add to your build.gradle file:
dependencies {
- compile 'com.carto:carto-mobile-sdk:4.0.2@aar'
+ compile 'com.carto:carto-mobile-sdk:4.1.0@aar'
}
{% endhighlight %}
@@ -64,7 +64,7 @@ These SDK libraries are managed by CARTO and include all the required libraries
// Add to your CocoaPods Podfile:
-pod 'CartoMobileSDK', '4.0.2'
+pod 'CartoMobileSDK', '4.1.0'
{% endhighlight %}
</div>
@@ -195,7 +195,7 @@ If using Android as the mobile platform, follow this implementation procedure.
{% highlight groovy %}
dependencies {
- compile 'com.carto:carto-mobile-sdk:4.0.2@aar'
+ compile 'com.carto:carto-mobile-sdk:4.1.0@aar'
}
{% endhighlight %}
@@ -317,7 +317,7 @@ If using iOS as the mobile platform, follow this implementation procedure.
// Add to your CocoaPods Podfile:
-pod 'CartoMobileSDK', '4.0.2'
+pod 'CartoMobileSDK', '4.1.0'
{% endhighlight %}
|
Tools: unitc avoid interactive rm(1) invocations.
|
@@ -161,7 +161,7 @@ if [ $REMOTE -eq 0 ]; then
# Cache the discovery for this unit PID (and cleanup any old files)
#
- rm /tmp/${0##*/}.* 2> /dev/null
+ rm -f /tmp/${0##*/}.* 2> /dev/null
echo UNIT_CTRL=\"${UNIT_CTRL}\" > /tmp/${0##*/}.$PID.env
echo ERROR_LOG=${ERROR_LOG} >> /tmp/${0##*/}.$PID.env
fi
@@ -221,11 +221,11 @@ if [ $CURL_STATUS -ne 0 ]; then
echo "${0##*/}: Check that you have permission to access the Unit control socket, or try again with sudo(8)"
else
echo "${0##*/}: Trying to access $UNIT_CTRL$URI"
- cat /tmp/${0##*/}.$$ && rm /tmp/${0##*/}.$$
+ cat /tmp/${0##*/}.$$ && rm -f /tmp/${0##*/}.$$
fi
exit 4
fi
-rm /tmp/${0##*/}.$$ 2> /dev/null
+rm -f /tmp/${0##*/}.$$ 2> /dev/null
if [ $SHOW_LOG -gt 0 ] && [ $NOLOG -eq 0 ] && [ $QUIET -eq 0 ]; then
echo -n "${0##*/}: Waiting for log..."
|
SOVERSION bump to version 5.6.42
|
@@ -54,7 +54,7 @@ set(SYSREPO_VERSION ${SYSREPO_MAJOR_VERSION}.${SYSREPO_MINOR_VERSION}.${SYSREPO_
# with backward compatible change and micro version is connected with any internal change of the library.
set(SYSREPO_MAJOR_SOVERSION 5)
set(SYSREPO_MINOR_SOVERSION 6)
-set(SYSREPO_MICRO_SOVERSION 41)
+set(SYSREPO_MICRO_SOVERSION 42)
set(SYSREPO_SOVERSION_FULL ${SYSREPO_MAJOR_SOVERSION}.${SYSREPO_MINOR_SOVERSION}.${SYSREPO_MICRO_SOVERSION})
set(SYSREPO_SOVERSION ${SYSREPO_MAJOR_SOVERSION})
|
Squashed 'opae-libs/' changes from 73697df0..65fecc5b
opae_add_subdirectory: make sure CMakeLists.txt exists.
git-subtree-dir: opae-libs
git-subtree-split:
|
@@ -158,12 +158,13 @@ endmacro()
function(opae_add_subdirectory directory_name)
get_filename_component(full_dir_path "${directory_name}" REALPATH)
- if(EXISTS "${full_dir_path}" AND IS_DIRECTORY "${full_dir_path}")
+ if(EXISTS "${full_dir_path}" AND IS_DIRECTORY "${full_dir_path}" AND EXISTS "${full_dir_path}/CMakeLists.txt")
add_subdirectory(${directory_name})
else()
- message("Directory not found: ${full_dir_path}")
+ message("Directory or CMakeLists.txt not found: ${full_dir_path}")
endif()
endfunction()
+
# example:
# opae_add_executable(TARGET fpgaconf SOURCE a.c b.c LIBS opae-c)
function(opae_add_executable)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.