Merge pull request #1989 from gforney/devel

smokeview source: fix shadowed variable warning - labelscoll -> label…
firemodels · Aug 14, 2024 · 95a4735 · 95a4735
2 parents b245b5b + 67c36ec
commit 95a4735
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Source/smokeview/output.c b/Source/smokeview/output.c
@@ -387,7 +387,7 @@ void OutputBarText(float x, float y, const GLfloat *color, char *string){
 
 /* ------------------ WriteLabels ------------------------ */
 
-void WriteLabels(labels_collection *labelscoll){
+void WriteLabels(labels_collection *labelscoll_arg){
   labeldata *first_label, *thislabel;
   FILE *stream = NULL;
   char quote[2];
@@ -396,7 +396,7 @@ void WriteLabels(labels_collection *labelscoll){
   stream = fopen(event_filename, "w");
   if(stream==NULL)return;
 
-  first_label = labelscoll->label_first_ptr;
+  first_label = labelscoll_arg->label_first_ptr;
   strcpy(quote,"\"");
 
   for(thislabel = first_label->next; thislabel->next!=NULL; thislabel = thislabel->next){
@@ -418,10 +418,10 @@ void WriteLabels(labels_collection *labelscoll){
 
 /* ------------------ DrawLabels ------------------------ */
 
-void DrawLabels(labels_collection *labelscoll){
+void DrawLabels(labels_collection *labelscoll_arg){
   labeldata *first_label, *thislabel;
 
-  first_label = labelscoll->label_first_ptr;
+  first_label = labelscoll_arg->label_first_ptr;
 
   glPushMatrix();
   glScalef(SCALE2SMV(1.0),SCALE2SMV(1.0),SCALE2SMV(1.0));