mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	Avoid using devname as a variable name.
On FreeBSD, devname() is a system function, and was overshadowed.
This commit is contained in:
		
							parent
							
								
									d963998676
								
							
						
					
					
						commit
						62278b4b94
					
				
					 1 changed files with 7 additions and 7 deletions
				
			
		| 
						 | 
					@ -1032,27 +1032,27 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if ((e = read_entry(u, name))) {
 | 
					        if ((e = read_entry(u, name))) {
 | 
				
			||||||
            uint32_t idx;
 | 
					            uint32_t idx;
 | 
				
			||||||
            char *devname;
 | 
					            char *device_name;
 | 
				
			||||||
            uint32_t found_index = PA_INVALID_INDEX;
 | 
					            uint32_t found_index = PA_INVALID_INDEX;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if ((devname = get_name(name, "sink:"))) {
 | 
					            if ((device_name = get_name(name, "sink:"))) {
 | 
				
			||||||
                pa_sink* s;
 | 
					                pa_sink* s;
 | 
				
			||||||
                PA_IDXSET_FOREACH(s, u->core->sinks, idx) {
 | 
					                PA_IDXSET_FOREACH(s, u->core->sinks, idx) {
 | 
				
			||||||
                    if (strcmp(s->name, devname) == 0) {
 | 
					                    if (strcmp(s->name, device_name) == 0) {
 | 
				
			||||||
                        found_index = s->index;
 | 
					                        found_index = s->index;
 | 
				
			||||||
                        break;
 | 
					                        break;
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                pa_xfree(devname);
 | 
					                pa_xfree(device_name);
 | 
				
			||||||
            } else if ((devname = get_name(name, "source:"))) {
 | 
					            } else if ((device_name = get_name(name, "source:"))) {
 | 
				
			||||||
                pa_source* s;
 | 
					                pa_source* s;
 | 
				
			||||||
                PA_IDXSET_FOREACH(s, u->core->sources, idx) {
 | 
					                PA_IDXSET_FOREACH(s, u->core->sources, idx) {
 | 
				
			||||||
                    if (strcmp(s->name, devname) == 0) {
 | 
					                    if (strcmp(s->name, device_name) == 0) {
 | 
				
			||||||
                        found_index = s->index;
 | 
					                        found_index = s->index;
 | 
				
			||||||
                        break;
 | 
					                        break;
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                pa_xfree(devname);
 | 
					                pa_xfree(device_name);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            pa_tagstruct_puts(reply, name);
 | 
					            pa_tagstruct_puts(reply, name);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue