From f3f1b2129492e780b304be86448d8f1badc14bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <krlmlr@users.noreply.github.com>
Date: Thu, 6 Mar 2025 11:58:24 +0100
Subject: [PATCH] chore: Fix Stimulus (#1737)

---
 Makefile-cigraph | 8 ++++----
 src/rinterface.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile-cigraph b/Makefile-cigraph
index e9a001d5e8..af4c3f6a1f 100644
--- a/Makefile-cigraph
+++ b/Makefile-cigraph
@@ -25,8 +25,8 @@ version_number: force
 
 PARSER := $(shell cd $(top_srcdir) ; git ls-files --full-name src | \
 	    grep -E '\.(l|y)$$')
-PARSER1 := $(patsubst src/%.l, src/%.c, $(PARSER))
-PARSER2 := $(patsubst src/%.y, src/%.c, $(PARSER1))
+PARSER1 := $(patsubst src/%.l, src/vendor/%.c, $(PARSER))
+PARSER2 := $(patsubst src/%.y, src/vendor/%.c, $(PARSER1))
 
 YACC=$(DOCKER) bison -b yy -d
 LEX=$(DOCKER) flex
@@ -50,7 +50,7 @@ $(PYVENV)/stamp: tools/build-requirements.txt
 
 # Apply possible patches
 
-patches: $(CORESRC) $(VENDORSRC) $(CINC) $(PARSER2)
+patches: $(PARSER2)
 	-rm -f src/*.orig
 	tools/fix-lexers.sh
 
@@ -142,7 +142,7 @@ R/aaa-auto.R: \
 # Makevars.in, Makevars.win and Makevars.ucrt are only regenerated if
 # the list of object files changes.
 
-OBJECTS := $(shell echo $(CORESRC) $(VENDORSRC) $(ARPACK) $(RAY) $(UUID) | \
+OBJECTS := $(shell echo $(ARPACK) $(RAY) $(UUID) | \
 		tr ' ' '\n' | \
         grep -E '\.(c|cpp|cc|f|l|y)$$' | \
 		sed 's/\.[^\.][^\.]*$$/.o/' | \
diff --git a/src/rinterface.c b/src/rinterface.c
index 4be3df7cc3..9160506cac 100644
--- a/src/rinterface.c
+++ b/src/rinterface.c
@@ -3697,11 +3697,11 @@ SEXP R_igraph_feedback_vertex_set(SEXP graph, SEXP weights, SEXP algo) {
   SEXP r_result;
                                         /* Convert input */
   R_SEXP_to_igraph(graph, &c_graph);
-  if (0 != igraph_vector_int_init(&c_result, 0)) {
-    igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
-  }
+  IGRAPH_R_CHECK(igraph_vector_int_init(&c_result, 0));
   IGRAPH_FINALLY(igraph_vector_int_destroy, &c_result);
-  if (!Rf_isNull(weights)) { R_SEXP_to_vector(weights, &c_weights); }
+  if (!Rf_isNull(weights)) {
+    R_SEXP_to_vector(weights, &c_weights);
+  }
   c_algo = (igraph_fvs_algorithm_t) Rf_asInteger(algo);
                                         /* Call igraph */
   IGRAPH_R_CHECK(igraph_feedback_vertex_set(&c_graph, &c_result, (Rf_isNull(weights) ? 0 : &c_weights), c_algo));