[Git][freetype/freetype][master] Minor clean-ups.

[Alexei Podtelezhnikov (@apodtele)]

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

• b34741c1
  by Alexei Podtelezhnikov at 2022-01-27T22:55:34-05:00

  Minor clean-ups.
  
  * src/base/ftrfork.c (raccess_make_file_name): Do not set error.
  * src/sfnt/sfdriver.c (get_win_string, get_apple_string): Ditto.
  * src/cff/cffobjs.c (cff_strcpy): Do not confuse about error.
  * src/psaux/psobjs.c (ps_table_done): Ditto.
  * src/truetype/ttgxvar.c (ft_var_readpacked*, ft_var_load_avar): Ditto.
  

5 changed files:

• src/base/ftrfork.c
• src/cff/cffobjs.c
• src/psaux/psobjs.c
• src/sfnt/sfdriver.c
• src/truetype/ttgxvar.c

Changes:

src/base/ftrfork.c

---

...	...	@@ -868,9 +868,7 @@
868	868	const char* tmp;
869	869	const char* slash;
870	870	size_t new_length;
871		- FT_Error error = FT_Err_Ok;
872		-
873		- FT_UNUSED( error );
	871	+ FT_Error error;
874	872
875	873
876	874	new_length = ft_strlen( original_name ) + ft_strlen( insertion );

src/cff/cffobjs.c

---

...	...	@@ -411,9 +411,7 @@
411	411	FT_String* result;
412	412
413	413
414		- (void)FT_STRDUP( result, source );
415		-
416		- FT_UNUSED( error );
	414	+ FT_MEM_STRDUP( result, source );
417	415
418	416	return result;
419	417	}

src/psaux/psobjs.c

---

...	...	@@ -258,8 +258,6 @@
258	258
259	259	table->capacity = table->cursor;
260	260	FT_FREE( old_base );
261		-
262		- FT_UNUSED( error );
263	261	}
264	262
265	263

src/sfnt/sfdriver.c

---

...	...	@@ -495,15 +495,13 @@
495	495	char_type_func char_type,
496	496	FT_Bool report_invalid_characters )
497	497	{
498		- FT_Error error = FT_Err_Ok;
	498	+ FT_Error error;
499	499
500	500	char* result = NULL;
501	501	FT_String* r;
502	502	FT_Char* p;
503	503	FT_UInt len;
504	504
505		- FT_UNUSED( error );
506		-
507	505
508	506	if ( FT_QALLOC( result, entry->stringLength / 2 + 1 ) )
509	507	return NULL;
...	...	@@ -554,15 +552,13 @@
554	552	char_type_func char_type,
555	553	FT_Bool report_invalid_characters )
556	554	{
557		- FT_Error error = FT_Err_Ok;
	555	+ FT_Error error;
558	556
559	557	char* result = NULL;
560	558	FT_String* r;
561	559	FT_Char* p;
562	560	FT_UInt len;
563	561
564		- FT_UNUSED( error );
565		-
566	562
567	563	if ( FT_QALLOC( result, entry->stringLength + 1 ) )
568	564	return NULL;

src/truetype/ttgxvar.c

---

...	...	@@ -151,9 +151,7 @@
151	151	FT_UInt i, j;
152	152	FT_UShort first;
153	153	FT_Memory memory = stream->memory;
154		- FT_Error error = FT_Err_Ok;
155		-
156		- FT_UNUSED( error );
	154	+ FT_Error error;
157	155
158	156
159	157	*point_cnt = 0;
...	...	@@ -266,9 +264,7 @@
266	264	FT_UInt i, j;
267	265	FT_UInt bytes_used;
268	266	FT_Memory memory = stream->memory;
269		- FT_Error error = FT_Err_Ok;
270		-
271		- FT_UNUSED( error );
	267	+ FT_Error error;
272	268
273	269
274	270	if ( FT_QNEW_ARRAY( deltas, delta_cnt ) )
...	...	@@ -361,14 +357,12 @@
361	357	FT_Memory memory = stream->memory;
362	358	GX_Blend blend = face->blend;
363	359	GX_AVarSegment segment;
364		- FT_Error error = FT_Err_Ok;
	360	+ FT_Error error;
365	361	FT_Long version;
366	362	FT_Long axisCount;
367	363	FT_Int i, j;
368	364	FT_ULong table_len;
369	365
370		- FT_UNUSED( error );
371		-
372	366
373	367	FT_TRACE2(( "AVAR " ));
374	368

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.