@@ -305,7 +305,7 @@ lyplg_type_store_bits(const struct ly_ctx *ctx, const struct lysc_type *type, co
305305 /* init storage */
306306 memset (storage , 0 , sizeof * storage );
307307 LYPLG_TYPE_VAL_INLINE_PREPARE (storage , val );
308- LY_CHECK_ERR_GOTO (!val , ret = LY_EMEM , cleanup );
308+ LY_CHECK_ERR_GOTO (!val , ret = ly_err_new_no_mem ( err ) , cleanup );
309309 storage -> realtype = type ;
310310
311311 /* check value length */
@@ -320,12 +320,12 @@ lyplg_type_store_bits(const struct ly_ctx *ctx, const struct lysc_type *type, co
320320 options &= ~LYPLG_TYPE_STORE_DYNAMIC ;
321321 } else {
322322 val -> bitmap = malloc (value_size );
323- LY_CHECK_ERR_GOTO (!val -> bitmap , ret = LY_EMEM , cleanup );
323+ LY_CHECK_ERR_GOTO (!val -> bitmap , ret = ly_err_new_no_mem ( err ) , cleanup );
324324 memcpy (val -> bitmap , value , value_size );
325325 }
326326
327327 /* allocate and fill the bit item array */
328- LYA_PREALLOC (val -> items , LYA_COUNT (type_bits -> bits ), LOGMEM ( ctx ); ret = LY_EMEM ; goto cleanup );
328+ LYA_PREALLOC (val -> items , LYA_COUNT (type_bits -> bits ), ret = ly_err_new_no_mem ( err ) ; goto cleanup );
329329 LY_CHECK_GOTO (ret = bits_bitmap2items (val -> bitmap , type_bits , val -> items , err ), cleanup );
330330
331331 /* success */
@@ -338,14 +338,14 @@ lyplg_type_store_bits(const struct ly_ctx *ctx, const struct lysc_type *type, co
338338
339339 /* allocate the bitmap */
340340 val -> bitmap = calloc (1 , LYPLG_BITS2BYTES (BITS_LAST_BIT_POSITION (type_bits ) + 1 ));
341- LY_CHECK_ERR_GOTO (!val -> bitmap , ret = LY_EMEM , cleanup );
341+ LY_CHECK_ERR_GOTO (!val -> bitmap , ret = ly_err_new_no_mem ( err ) , cleanup );
342342
343343 /* fill the bitmap */
344344 ret = bits_str2bitmap (value , value_size , type_bits , val -> bitmap , err );
345345 LY_CHECK_GOTO (ret , cleanup );
346346
347347 /* allocate and fill the bit item array */
348- LYA_PREALLOC (val -> items , LYA_COUNT (type_bits -> bits ), LOGMEM ( ctx ); ret = LY_EMEM ; goto cleanup );
348+ LYA_PREALLOC (val -> items , LYA_COUNT (type_bits -> bits ), ret = ly_err_new_no_mem ( err ) ; goto cleanup );
349349 LY_CHECK_GOTO (ret = bits_bitmap2items (val -> bitmap , type_bits , val -> items , err ), cleanup );
350350
351351 if (format == LY_VALUE_CANON ) {
@@ -356,7 +356,7 @@ lyplg_type_store_bits(const struct ly_ctx *ctx, const struct lysc_type *type, co
356356 LY_CHECK_GOTO (ret , cleanup );
357357 } else {
358358 ret = lydict_insert (ctx , value_size ? value : "" , value_size , & storage -> _canonical );
359- LY_CHECK_GOTO (ret != LY_SUCCESS , cleanup );
359+ LY_CHECK_GOTO (ret , cleanup );
360360 }
361361 }
362362
0 commit comments